simon-git: spigot (main): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  fc53176 Remove git hash from the Python module version number.
  5093be1 Stop testing the Python module on Python 2.
  d0b3de7 Fix Python setuptools warning about setup.cfg spelling.
  1baa3aa Fix compile failure in the Python module itself.
  7f6ba4a python-testenv: update for new lib directory naming scheme.
  bf79a1f Python docs: set the language.
  f158e08 Replace test of the docs coverage output.

Repository:     https://git.tartarus.org/simon/spigot.git
On the web:     https://git.tartarus.org/?p=simon/spigot.git
Branch updated: main
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2024-09-08 20:16:40

commit fc531760411439c2407e8b16eabb1b4e8b4e1be2
web diff https://git.tartarus.org/?p=simon/spigot.git;a=commitdiff;h=fc531760411439c2407e8b16eabb1b4e8b4e1be2;hp=10bd0ca02e668d0218b0d4603ff6f67239c1f017
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Sep 8 19:06:34 2024 +0100

    Remove git hash from the Python module version number.
    
    It was in violation of PEP 440, which is extremely strict about what
    kind of thing you can put in a version number. Ubuntu 24.04's Python
    setuptools has started complaining about it.
    
    For the automated builds I've just left the date in there. For the
    fixed "NOVERSION" when you run from the build directory, I've made it
    0.0.dev0 which is equally useless.

 Buildscr | 3 ++-
 setup.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 5093be1678375b2e5e7b1ea91b7d75869143c143
web diff https://git.tartarus.org/?p=simon/spigot.git;a=commitdiff;h=5093be1678375b2e5e7b1ea91b7d75869143c143;hp=fc531760411439c2407e8b16eabb1b4e8b4e1be2
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Sep 8 19:07:24 2024 +0100

    Stop testing the Python module on Python 2.
    
    This is also a build fix for Ubuntu 24.04, which hasn't got P2 any
    more. I can't really disagree. It's past time to get rid of that, and
    in the same spirit, I don't think there's any reason to carry on
    supporting it in spigot any more.

 Buildscr | 4 ----
 1 file changed, 4 deletions(-)

commit d0b3de71b0a1b8c7f4adb34314930bb44315e142
web diff https://git.tartarus.org/?p=simon/spigot.git;a=commitdiff;h=d0b3de71b0a1b8c7f4adb34314930bb44315e142;hp=5093be1678375b2e5e7b1ea91b7d75869143c143
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Sep 8 19:22:05 2024 +0100

    Fix Python setuptools warning about setup.cfg spelling.
    
    Apparently 'build-base' is deprecated and it should be 'build_base'.

 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 1baa3aae6399a5044a9e64fab5a0ef28f7afa282
web diff https://git.tartarus.org/?p=simon/spigot.git;a=commitdiff;h=1baa3aae6399a5044a9e64fab5a0ef28f7afa282;hp=d0b3de71b0a1b8c7f4adb34314930bb44315e142
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Sep 8 19:22:29 2024 +0100

    Fix compile failure in the Python module itself.

 python-module/internal.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7f6ba4ad231030a3d2f982eab3acb41650d9bbbe
web diff https://git.tartarus.org/?p=simon/spigot.git;a=commitdiff;h=7f6ba4ad231030a3d2f982eab3acb41650d9bbbe;hp=1baa3aae6399a5044a9e64fab5a0ef28f7afa282
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Sep 8 19:32:38 2024 +0100

    python-testenv: update for new lib directory naming scheme.
    
    Apparently Python 3.12 has changed the way it puts the Python version
    number in the lib directory name, so automatically finding the right
    lib directory is harder because now we have to try both kinds.

 python-module/testenv | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

commit bf79a1f0c3083ceb6b9ae66e1dac9bd5570c34ee
web diff https://git.tartarus.org/?p=simon/spigot.git;a=commitdiff;h=bf79a1f0c3083ceb6b9ae66e1dac9bd5570c34ee;hp=7f6ba4ad231030a3d2f982eab3acb41650d9bbbe
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Sep 8 19:36:38 2024 +0100

    Python docs: set the language.
    
    Updated sphinx-build objects to None.

 python-doc/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f158e08520c061c01271fddcfa439d35b737d587
web diff https://git.tartarus.org/?p=simon/spigot.git;a=commitdiff;h=f158e08520c061c01271fddcfa439d35b737d587;hp=bf79a1f0c3083ceb6b9ae66e1dac9bd5570c34ee
Author: Simon Tatham <anakin at pobox.com>
Date:   Sun Sep 8 20:11:34 2024 +0100

    Replace test of the docs coverage output.
    
    My previous approach of checking that _build/coverage/python.txt
    didn't have much in it is no longer useful, because on Ubuntu 24.04,
    now that file has an ASCII table in it. There's a pickle file which we
    can check instead, but that means actually writing some Python.
    
    (Also I'm not convinced the test is _working_, in that I randomly
    removed a docstring to see what a failure looked like, and didn't get
    a failure. But that's a problem for another day; at the moment I want
    the builds to at least work.)

 Buildscr                     |  2 +-
 python-module/coverage-check | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)