[med-svn] [Git][med-team/resfinder][master] 2 commits: Fix collections import under python 3.10+

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / resfinder


Commits:
05cc2f87 by Andreas Hasenack at 2022-02-05T19:47:46+00:00
Fix collections import under python 3.10+

Closes: #1005030

- - - - -
0c4d4dae by Andreas Tille at 2022-02-07T05:28:23+00:00
Merge branch 'salsa-resfinder-py310-collections-import' into 'master'

Fix collections import under python 3.10+

See merge request med-team/resfinder!2
- - - - -


2 changed files:

- + debian/patches/py310_collections_import.patch
- debian/patches/series


Changes:

=====================================
debian/patches/py310_collections_import.patch
=====================================
@@ -0,0 +1,24 @@
+Description: fix collections import under py3.10
+ In python 3.10[1] deprecated aliases to Collections Abstract Base Classes from
+ the collections module have been removed. These imports must be done from
+ collections.abc.
+ .
+ 1. https://docs.python.org/3/whatsnew/3.10.html
+Author: Andreas Hasenack <andreas at canonical.com>
+Bug: https://bitbucket.org/genomicepidemiology/resfinder/issues/70/
+Bug-Debian: https://bugs.debian.org/1005030
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/resfinder/+bug/1960146
+Last-Update: 2022-02-05
+diff --git a/cge/output/orderedset.py b/cge/output/orderedset.py
+index 99265d9..79cca32 100644
+--- a/cge/output/orderedset.py
++++ b/cge/output/orderedset.py
+@@ -17,7 +17,7 @@
+ # SOFTWARE.
+ import collections
+ 
+-class OrderedSet(collections.MutableSet):
++class OrderedSet(collections.abc.MutableSet):
+ 
+     def __init__(self, iterable=None):
+         self.end = end = []


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 fix_path_in_testscript.patch
 fix_syntax.patch
 fix-shebang.patch
+py310_collections_import.patch



View it on GitLab: https://salsa.debian.org/med-team/resfinder/-/compare/8c49258ea601d098038058853e28627a6ef51c1a...0c4d4daebe6e946ff677ec25722e6cdf46a9f54b

-- 
View it on GitLab: https://salsa.debian.org/med-team/resfinder/-/compare/8c49258ea601d098038058853e28627a6ef51c1a...0c4d4daebe6e946ff677ec25722e6cdf46a9f54b
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/20220207/5b2cee5f/attachment-0001.htm>