[med-svn] [Git][med-team/python-csb][master] 3 commits: Add patch to fix python 3.10 autopkgtest failure (Closes: #1001410)

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / python-csb


Commits:
5f050a4f by Nilesh Patra at 2021-12-10T03:22:19+05:30
Add patch to fix python 3.10 autopkgtest failure (Closes: #1001410)

- - - - -
f4b60e21 by Nilesh Patra at 2021-12-10T03:37:49+05:30
d/t/build: Use -s with py3versions instead of -i

- - - - -
afb66e4b by Nilesh Patra at 2021-12-10T03:38:13+05:30
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/avoid-multiple-namespace.patch
- debian/patches/series
- debian/tests/build


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+python-csb (1.2.5+dfsg-7) unstable; urgency=medium
+
+  * Team Upload.
+  * Add patch to fix python 3.10 autopkgtest failure (Closes: #1001410)
+  * d/t/build: Use -s with py3versions instead of -i
+
+ -- Nilesh Patra <nilesh at debian.org>  Fri, 10 Dec 2021 03:37:52 +0530
+
 python-csb (1.2.5+dfsg-6) unstable; urgency=medium
 
   * Fix watchfile to detect new versions on github


=====================================
debian/patches/avoid-multiple-namespace.patch
=====================================
@@ -0,0 +1,33 @@
+Description: Do not multiple-inherit NameError and ImportError, rather simply raise NameError when import is not found
+Author: Nilesh Patra <nilesh at debian.org>
+Last-Update: 2021-12-10
+--- a/csb/test/__init__.py
++++ b/csb/test/__init__.py
+@@ -443,9 +443,6 @@
+                 
+         return runner.run(suite)            
+ 
+-class InvalidNamespaceError(NameError, ImportError):
+-    pass
+-    
+ class AbstractTestBuilder(object):
+     """
+     This is a base class, defining a test loader which exposes the C{loadTests}
+@@ -537,7 +534,7 @@
+         try:
+             base = __import__(namespace, level=0, fromlist=['']).__file__
+         except ImportError:
+-            raise InvalidNamespaceError('Namespapce {0} is not importable'.format(namespace))
++            raise NameError('Namespace {0} is not importable'.format(namespace))
+         
+         if os.path.splitext(os.path.basename(base))[0] != '__init__':
+             suites.append(self.loadTests(namespace))
+@@ -665,7 +662,7 @@
+             try:
+                 mod = __import__(namespace, fromlist=[''])
+             except ImportError:
+-                raise InvalidNamespaceError('Namespace {0} is not importable'.format(namespace))
++                raise NameError('Namespace {0} is not importable'.format(namespace))
+             suites = self._inspect(mod)                  
+             return unittest.TestSuite(suites)    
+     


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 exclude_online_tests.patch
 reproducible.patch
 fix_setup.patch
+avoid-multiple-namespace.patch


=====================================
debian/tests/build
=====================================
@@ -5,6 +5,6 @@ set -eu
 cp -r csb/test "$AUTOPKGTEST_TMP/"
 
 cd "$AUTOPKGTEST_TMP"
-for py in $(py3versions -i); do
+for py in $(py3versions -s); do
     PYTHONWARNINGS=d $py test/app.py --generated-resources /tmp --verbosity 2
 done



View it on GitLab: https://salsa.debian.org/med-team/python-csb/-/compare/ca435c6dd709cab858e70ff9a06de3b10929e550...afb66e4b7a8a47f26fcb2ec6dddaa46f452dd757

-- 
View it on GitLab: https://salsa.debian.org/med-team/python-csb/-/compare/ca435c6dd709cab858e70ff9a06de3b10929e550...afb66e4b7a8a47f26fcb2ec6dddaa46f452dd757
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/20211209/bcfb1fa6/attachment-0001.htm>