[med-svn] [Git][med-team/atropos][master] 4 commits: Add python3.10.patch

[Étienne Mollier (@emollier)]

Étienne Mollier pushed to branch master at Debian Med / atropos


Commits:
42a74cab by Étienne Mollier at 2022-03-29T23:16:03+02:00
Add python3.10.patch

Closes: 1008635

- - - - -
f5c6a296 by Étienne Mollier at 2022-03-29T23:17:07+02:00
Cleanup d/patches/.

- - - - -
6e9602f5 by Étienne Mollier at 2022-03-29T23:20:36+02:00
initialize changelog

- - - - -
73f3edf8 by Étienne Mollier at 2022-03-29T23:22:30+02:00
routine-update: Ready to upload to unstable

- - - - -


5 changed files:

- debian/changelog
- + debian/patches/python3.10.patch
- − debian/patches/python3.9.patch
- − debian/patches/scm.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+atropos (1.1.31+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Add python3.10.patch.  (Closes: #1008635)
+  * Cleanup d/patches/.
+
+ -- Étienne Mollier <emollier at debian.org>  Tue, 29 Mar 2022 23:21:04 +0200
+
 atropos (1.1.31+dfsg-1) unstable; urgency=medium
 
   [ Steffen Moeller ]


=====================================
debian/patches/python3.10.patch
=====================================
@@ -0,0 +1,40 @@
+Description: query modules from collections.abc instead of plain collections.
+ This fixes test failures when running on Python 3.10.
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/1008635
+Forwarded: no
+Last-Update: 2022-03-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- atropos.orig/atropos/util/__init__.py
++++ atropos/atropos/util/__init__.py
+@@ -1,6 +1,7 @@
+ """Widely useful utility methods.
+ """
+-from collections import OrderedDict, Iterable, Sequence
++from collections import OrderedDict
++from collections.abc import Iterable, Sequence
+ from datetime import datetime
+ import errno
+ import functools
+--- atropos.orig/atropos/commands/base.py
++++ atropos/atropos/commands/base.py
+@@ -1,6 +1,6 @@
+ """Common classes/functions used in commands.
+ """
+-from collections import Sequence
++from collections.abc import Sequence
+ import copy
+ import platform
+ import sys
+--- atropos.orig/atropos/commands/trim/__init__.py
++++ atropos/atropos/commands/trim/__init__.py
+@@ -1,6 +1,7 @@
+ """Implementation of the 'trim' command.
+ """
+-from collections import Sequence, defaultdict
++from collections import defaultdict
++from collections.abc import Sequence
+ import logging
+ import os
+ import sys


=====================================
debian/patches/python3.9.patch deleted
=====================================
@@ -1,17 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Thu, 14 Oct 2021 11:14:38 +0200
-Description: Enable builds with Python3.9
-  This patch is for future 2.0.x series and applied to alpha versions currently
-
---- a/setup.py
-+++ b/setup.py
-@@ -23,7 +23,8 @@ if sys.version_info < (3, 6):
- MIN_CYTHON_VERSIONS = {
-     (3, 6): "0.25.2",
-     (3, 7): "0.29",
--    (3, 8): "0.29.14"
-+    (3, 8): "0.29.14",
-+    (3, 9): "0.29.14"
- }
- min_cython_version = MIN_CYTHON_VERSIONS[version_info[0:2]]
- 


=====================================
debian/patches/scm.patch deleted
=====================================
@@ -1,17 +0,0 @@
-Author: Steffen Moeller
-Last-Update: 2020-01-12 22:33:29 +0100
-Description: This patch is for future 2.0.x series and applied to alpha versions currently
-
-Index: atropos/setup.py
-===================================================================
---- atropos.orig/setup.py
-+++ atropos/setup.py
-@@ -162,7 +162,7 @@ extra_requirements = {
- 
- setup(
-     name="atropos",
--    use_scm_version=True,
-+    use_scm_version=False,
-     cmdclass={
-         "build_ext": BuildExtCython,
-         "sdist": SdistCython


=====================================
debian/patches/series
=====================================
@@ -1,2 +1 @@
-# scm.patch
-# python3.9.patch
+python3.10.patch



View it on GitLab: https://salsa.debian.org/med-team/atropos/-/compare/171b1c0026bbc87faab92900e02fb1ddec0a5bdc...73f3edf8c85fd30ce31079cc4e6110f54314e5b4

-- 
View it on GitLab: https://salsa.debian.org/med-team/atropos/-/compare/171b1c0026bbc87faab92900e02fb1ddec0a5bdc...73f3edf8c85fd30ce31079cc4e6110f54314e5b4
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/20220329/8b40289c/attachment-0001.htm>