[med-svn] [Git][python-team/packages/sphinxcontrib-autoprogram][master] 5 commits: New upstream version 0.1.8

Alexandre Detiste (@detiste-guest) gitlab at salsa.debian.org
Sat Jan 6 17:05:39 GMT 2024



Alexandre Detiste pushed to branch master at Debian Python Team / packages / sphinxcontrib-autoprogram


Commits:
d85dc740 by Alexandre Detiste at 2024-01-06T17:48:25+01:00
New upstream version 0.1.8
- - - - -
e6cf557a by Alexandre Detiste at 2024-01-06T17:48:26+01:00
Update upstream source from tag 'upstream/0.1.8'

Update to upstream version '0.1.8'
with Debian dir f7d498ecef2aeb9613d688832914818ae1794006
- - - - -
e2a99186 by Alexandre Detiste at 2024-01-06T17:56:11+01:00
start a changelog

- - - - -
ee850fcf by Alexandre Detiste at 2024-01-06T18:03:15+01:00
remove old patches applied upstream

- - - - -
1988cff2 by Alexandre Detiste at 2024-01-06T18:04:26+01:00
add debian/.gitignore

- - - - -


10 changed files:

- .github/workflows/build.yml
- + debian/.gitignore
- debian/changelog
- − debian/patches/0002-Mock-state_machine-in-AutoprogramDirectiveTestCase.patch
- − debian/patches/fix_test.patch
- − debian/patches/series
- doc/changelog.rst
- setup.py
- sphinxcontrib/autoprogram.py
- tox.ini


Changes:

=====================================
.github/workflows/build.yml
=====================================
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout at v2
@@ -69,7 +69,7 @@ jobs:
       working-directory: ${{ github.workspace }}/tmp/sdist
 
     - name: Publish package
-      if: github.event_name == 'release' && startsWith(github.ref, 'refs/tags') && matrix.python-version == 3.9
+      if: github.event_name == 'release' && startsWith(github.ref, 'refs/tags') && matrix.python-version == 3.11
       uses: pypa/gh-action-pypi-publish at v1.4.2
       with:
         user: __token__


=====================================
debian/.gitignore
=====================================
@@ -0,0 +1,7 @@
+/.debhelper/
+/debhelper-build-stamp
+/files
+/*.debhelper.log
+/*.debhelper
+/*.substvars
+/python3-sphinxcontrib.autoprogram/


=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+sphinxcontrib-autoprogram (0.1.8-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream version 0.1.8
+
+ -- Alexandre Detiste <tchet at debian.org>  Sat, 06 Jan 2024 17:55:42 +0100
+
 sphinxcontrib-autoprogram (0.1.7-4) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/0002-Mock-state_machine-in-AutoprogramDirectiveTestCase.patch deleted
=====================================
@@ -1,29 +0,0 @@
-From: Jochen Sprickerhof <jspricke at debian.org>
-Date: Fri, 10 Feb 2023 20:41:15 +0100
-Subject: Mock state_machine in AutoprogramDirectiveTestCase
-
----
- sphinxcontrib/autoprogram.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/sphinxcontrib/autoprogram.py b/sphinxcontrib/autoprogram.py
-index de687af..d9fc924 100644
---- a/sphinxcontrib/autoprogram.py
-+++ b/sphinxcontrib/autoprogram.py
-@@ -19,6 +19,7 @@ import re
- import sys
- from typing import Any, Dict, Iterable, List, Optional, Tuple
- import unittest
-+from unittest import mock
- 
- from docutils import nodes
- from docutils.parsers.rst import Directive
-@@ -534,7 +535,7 @@ class AutoprogramDirectiveTestCase(unittest.TestCase):
-             0,
-             ".. autoprogram:: cli:parser\n   :prog: cli.py\n",
-             None,
--            None,
-+            mock.Mock(),
-         )
- 
-     def tearDown(self) -> None:


=====================================
debian/patches/fix_test.patch deleted
=====================================
@@ -1,22 +0,0 @@
-From: Andreas Tille <tille at debian.org>
-Date: Fri, 10 Feb 2023 20:03:14 +0100
-Subject: Adapt test to current output
-
-Last-Update: Tue, 29 Nov 2022 17:59:22 +0100
----
- sphinxcontrib/autoprogram.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sphinxcontrib/autoprogram.py b/sphinxcontrib/autoprogram.py
-index c60cf68..de687af 100644
---- a/sphinxcontrib/autoprogram.py
-+++ b/sphinxcontrib/autoprogram.py
-@@ -476,7 +476,7 @@ class ScannerTestCase(unittest.TestCase):
-         # section: default optionals
-         program, options, group = sections[1]
-         self.assertEqual([], program)
--        self.assertEqual("optional arguments", group.title)
-+        self.assertEqual("options", group.title)
-         self.assertEqual(None, group.description)
-         self.assertEqual(2, len(options))
-         self.assertEqual(


=====================================
debian/patches/series deleted
=====================================
@@ -1,2 +0,0 @@
-fix_test.patch
-0002-Mock-state_machine-in-AutoprogramDirectiveTestCase.patch


=====================================
doc/changelog.rst
=====================================
@@ -1,13 +1,13 @@
 Changelog
 =========
 
-..
-   TODO Uncomment this:
+Version 0.1.8
+-------------
+
+Released on February 11, 2023.
 
-   Version 0.1.8
-   -------------
+- Test against Python 3.10, 3.11.
 
-   To be released.
 
 Version 0.1.7
 -------------


=====================================
setup.py
=====================================
@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
 
 
 # Do not change the variable name.  It's parsed by doc/conf.py script.
-version = '0.1.7'
+version = '0.1.8'
 
 requires = ['Sphinx >= 1.2', 'six']
 
@@ -35,20 +35,18 @@ setup(
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: Stackless',
         'Topic :: Documentation',
         'Topic :: Software Development :: Documentation',
         'Topic :: Utilities'
     ],
+    python_requires='>=3.7',
     platforms='any',
     packages=find_packages(),
     namespace_packages=['sphinxcontrib'],


=====================================
sphinxcontrib/autoprogram.py
=====================================
@@ -19,6 +19,7 @@ import re
 import sys
 from typing import Any, Dict, Iterable, List, Optional, Tuple
 import unittest
+from unittest import mock
 
 from docutils import nodes
 from docutils.parsers.rst import Directive
@@ -476,7 +477,11 @@ class ScannerTestCase(unittest.TestCase):
         # section: default optionals
         program, options, group = sections[1]
         self.assertEqual([], program)
-        self.assertEqual("optional arguments", group.title)
+        # See https://github.com/sphinx-contrib/autoprogram/issues/24
+        if sys.version_info >= (3, 10):
+            self.assertEqual('options', group.title)
+        else:
+            self.assertEqual('optional arguments', group.title)
         self.assertEqual(None, group.description)
         self.assertEqual(2, len(options))
         self.assertEqual(
@@ -534,7 +539,7 @@ class AutoprogramDirectiveTestCase(unittest.TestCase):
             0,
             ".. autoprogram:: cli:parser\n   :prog: cli.py\n",
             None,
-            None,
+            mock.Mock(),
         )
 
     def tearDown(self) -> None:


=====================================
tox.ini
=====================================
@@ -7,9 +7,7 @@
 # them.
 
 [tox]
-envlist =
-    {py37,py38,py39}-{sphinx34,sphinx33,sphinx32,sphinx24,sphinx18}
-    black flake8 mypy pylint
+envlist = {py37,py38,py39,py310,py311}-{sphinx34,sphinx33,sphinx32,sphinx24,sphinx18}
 minversion = 2.7.0
 
 [testenv]



View it on GitLab: https://salsa.debian.org/python-team/packages/sphinxcontrib-autoprogram/-/compare/24a5c978b7f4cdb00ff438903615b68d3364806a...1988cff22e3d569869f9dfbda3501be5f2e2a022

-- 
View it on GitLab: https://salsa.debian.org/python-team/packages/sphinxcontrib-autoprogram/-/compare/24a5c978b7f4cdb00ff438903615b68d3364806a...1988cff22e3d569869f9dfbda3501be5f2e2a022
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20240106/ae82ce19/attachment-0001.htm>


More information about the debian-med-commit mailing list