Hi Bruno,
On 2/26/24 2:54 PM, Bruno Haible wrote:
> I tend to agree. Even after it is finished, it will still be useful
> to have all Python sources in one directory: it makes it easy to do
> a "grep something *.py".
True. I've already run into this a few times. :)
> Done:
>
> 2024-02-26 Bruno Haible <br...@clisp.org>
>
> gnulib-tool.py: Reorganize code.
> * pygnulib/main.py: New file, moved here from gnulib-tool.py.
> * pygnulib/constants.py: Change the way APP['name'] and DIRS['root'] are
> computed.
> * gnulib-tool.py: New file, based on gnulib-tool.
>
> (The patch is best viewed using gitk.)
I took a brief look at the patch and everything looks good. I've run
the merge-emacs script and confirmed that it works just as before.
> You can now submit the two configuration files in the pygnulib/ directory.
> That's the proper place, not the root directory of gnulib.
Done. I've confirmed that pylint recognizes .pylintrc so I've used
that file name instead. One thing to note is that you must run pylint
from the pygnulib/ subdirectory. Pycodestyle doesn't have this
restriction. For example:
# Works
[collin@debian pygnulib]$ pylint main.py
# Doesn't work, doesn't pick up configuration file.
[collin@debian pygnulib]$ cd ../
[collin@debian gnulib]$ pylint pygnulib/main.py
This isn't a problem for me but I figured I'd mention it in case
someone gets scared by a ton of warnings that we don't care about.
The second patch fixes an undefined variable access that was uncovered
by the typos of mine that you fixed.
[collin@debian pygnulib]$ gnulib-tool.py --create-testdir --dir test dummy
Traceback (most recent call last):
File "/home/collin/.local/src/gnulib/pygnulib/main.py", line 1180, in
<module>
main()
File "/home/collin/.local/src/gnulib/pygnulib/main.py", line 608, in main
if mode != None and 'test' in mode and gnu_make:
^^^^^^^^
UnboundLocalError: cannot access local variable 'gnu_make' where it is not
associated with a value
That was my fault, sorry about that. That file should probably be
cleaned up at a later date. For some reason all of the fields in the
object returned by argparse are used before being assigned to local
variables and then used again.
Thanks,
CollinFrom 900ded124da7b8f5c267dd58b423f119ac1eda2a Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.fu...@gmail.com>
Date: Mon, 26 Feb 2024 16:02:34 -0800
Subject: [PATCH 1/2] gnulib-tool.py: Add configuration files for Python tools.
* pygnulib/.pylintrc: New file, used by pylintrc.
* pygnulib/setup.cfg: New file, currently only used for pycodestyle
options.
---
ChangeLog | 7 +++++++
pygnulib/.pylintrc | 8 ++++++++
pygnulib/setup.cfg | 10 ++++++++++
3 files changed, 25 insertions(+)
create mode 100644 pygnulib/.pylintrc
create mode 100644 pygnulib/setup.cfg
diff --git a/ChangeLog b/ChangeLog
index af84986424..5b40d684ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-02-26 Collin Funk <collin.fu...@gmail.com>
+
+ gnulib-tool.py: Add configuration files for Python tools.
+ * pygnulib/.pylintrc: New file, used by pylintrc.
+ * pygnulib/setup.cfg: New file, currently only used for pycodestyle
+ options.
+
2024-02-26 Bruno Haible <br...@clisp.org>
gnulib-tool.py: Reorganize code.
diff --git a/pygnulib/.pylintrc b/pygnulib/.pylintrc
new file mode 100644
index 0000000000..7c4c1a338c
--- /dev/null
+++ b/pygnulib/.pylintrc
@@ -0,0 +1,8 @@
+# .pylintrc
+
+[MESSAGES CONTROL]
+disable=C0103,C0114,C0121,C0209,C0301,C0302,R0902,R0912,R0913,R0914,R0915,R1705,R1702,R1720
+
+# Local Variables:
+# mode: conf
+# End:
diff --git a/pygnulib/setup.cfg b/pygnulib/setup.cfg
new file mode 100644
index 0000000000..5d4a17171a
--- /dev/null
+++ b/pygnulib/setup.cfg
@@ -0,0 +1,10 @@
+# setup.cfg
+
+[pycodestyle]
+ignore = E265,W503,E241,E711,E712,E201,E202,E221
+max-line-length = 136
+statistics = True
+
+# Local Variables:
+# mode: conf
+# End:
--
2.39.2
From c995d3334c9822ca9496025c0de674c0c041d183 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.fu...@gmail.com>
Date: Mon, 26 Feb 2024 16:13:46 -0800
Subject: [PATCH 2/2] gnulib-tool.py: Fix undefined variable access.
* pygnulib/main.py (main): Don't use gnu_make before it is defined.
---
ChangeLog | 5 +++++
pygnulib/main.py | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 5b40d684ce..035eda5c25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-02-26 Collin Funk <collin.fu...@gmail.com>
+
+ gnulib-tool.py: Fix undefined variable access.
+ * pygnulib/main.py (main): Don't use gnu_make before it is defined.
+
2024-02-26 Collin Funk <collin.fu...@gmail.com>
gnulib-tool.py: Add configuration files for Python tools.
diff --git a/pygnulib/main.py b/pygnulib/main.py
index 3d615ddbac..cfa59c6562 100644
--- a/pygnulib/main.py
+++ b/pygnulib/main.py
@@ -605,7 +605,7 @@ def main():
if cmdargs.pobase == None and cmdargs.podomain != None:
message = '%s: warning: --po-domain has no effect without a --po-base option\n' % constants.APP['name']
sys.stderr.write(message)
- if mode != None and 'test' in mode and gnu_make:
+ if mode != None and 'test' in mode and cmdargs.gnu_make:
message = '%s: --gnu-make not supported when including tests\n' % constants.APP['name']
sys.stderr.write(message)
sys.exit(1)
--
2.39.2
