From: "Péter Ujfalusi" <peter.ujfalusi@linux.intel.com>
To: Joe Perches <joe@perches.com>, apw@canonical.com
Cc: dwaipayanray1@gmail.com, lukas.bulwahn@gmail.com,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] checkpatch: get default codespell dictionary path from package location
Date: Mon, 11 Oct 2021 12:33:16 +0300 [thread overview]
Message-ID: <31b021d0-63e4-32f8-9df9-dcf4f0c4cb6f@linux.intel.com> (raw)
In-Reply-To: <ad5adffe862f33debdf869465cf90878224ea893.camel@perches.com>
Hi Joe,
On 11/10/2021 11:11, Joe Perches wrote:
> On Mon, 2021-10-11 at 09:32 +0300, Peter Ujfalusi wrote:
>> The standard location of dictionary.txt is under codespell's package, on
>> my machine atm (codespell 2.1, Artix Linux):
>> /usr/lib/python3.9/site-packages/codespell_lib/data/dictionary.txt
>>
>> Since we enable the codespell by default for SOF I have constant:
>
> If you enable it by default, you probably are using a .checkpatch.conf file.
It is enabled via a commit hook and started to fail after codespell
update to 2.1 (when the /usr/share/codespell/dictionary.txt no longer exist)
This is downstream port of checkpatch.pl in sof:
https://thesofproject.github.io
If I would have enabled it locally I would have also specified the
codespellfile in .checkpatch.conf.
> --codespell is not a typical default so I think always doing this test
> regardless of --codespell being enabled is inappropriate.
I tend to agree.
>> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> []
>> @@ -73,6 +73,12 @@ my $git_command ='export LANGUAGE=en_US.UTF-8; git';
>> my $tabsize = 8;
>> my ${CONFIG_} = "CONFIG_";
>>
>> +# Override the codespellfile location based on codespell install location
>> +if (which("codespell") ne "" && which("python") ne "") {
>> + my $codespell_dict = `python -c "import os.path as op; import codespell_lib; print(op.join(op.dirname(codespell_lib.__file__), 'data', 'dictionary.txt'), end='')" 2> /dev/null`;
>> + $codespellfile = $codespell_dict if (-e $codespell_dict);
>> +}
>> +
>
> Maybe add a function and/or use something like:
>
> if (($codespell || $help) &&
> which(etc...
Right, so I will move the check after the GetOptions() to have the
$codespell and $help options evaluated.
>> sub help {
>> my ($exitcode) = @_;
>>
>>
>> @@ -130,7 +136,7 @@ Options:
>> --ignore-perl-version override checking of perl version. expect
>> runtime errors.
>> --codespell Use the codespell dictionary for spelling/typos
>> - (default:/usr/share/codespell/dictionary.txt)
>> + (default:$codespellfile)
>
> I think this should not be changed or only be shown as $codespellfile when
> --codespell is added on the command line
If I run the 'scripts/checkpatch.pl -h' I would like to see the options
and defaults that will be used and I don't expect that the default of
the dictionary.tx would be different between
scripts/checkpatch.pl -h
default:/usr/share/codespell/dictionary.txt)
scripts/checkpatch.pl --codespell -h
(default:/usr/lib/python3.9/site-packages/codespell_lib/data/dictionary.txt)
I think this is not too intuitive.
Now I have a working and consistent version, let's see how that looks like.
>
>> --codespellfile Use this codespell dictionary
>> --typedefsfile Read additional types from this file
>> --color[=WHEN] Use colors 'always', 'never', or only when output
>
>
--
Péter
prev parent reply other threads:[~2021-10-11 9:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-11 6:32 [PATCH v2] checkpatch: get default codespell dictionary path from package location Peter Ujfalusi
2021-10-11 8:11 ` Joe Perches
2021-10-11 9:33 ` Péter Ujfalusi [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=31b021d0-63e4-32f8-9df9-dcf4f0c4cb6f@linux.intel.com \
--to=peter.ujfalusi@linux.intel.com \
--cc=apw@canonical.com \
--cc=dwaipayanray1@gmail.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lukas.bulwahn@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox