[med-svn] [Git][med-team/python-cogent][master] 2 commits: Remove unneeded patch

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / python-cogent


Commits:
cf59ff18 by Andreas Tille at 2021-11-04T09:53:40+01:00
Remove unneeded patch

- - - - -
4cf1d670 by Andreas Tille at 2021-11-04T09:54:49+01:00
Upstream switched to filt build system

- - - - -


5 changed files:

- debian/changelog
- debian/control
- − debian/patches/py39_union_dict
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,9 @@
-python-cogent (2021.10.12a1+dfsg-1) UNRELEASED; urgency=medium
+python-cogent (2021.10.12a1+dfsg-1) unstable; urgency=medium
 
   * New upstream version
+  * Upstream switched to filt build system
 
- -- Andreas Tille <tille at debian.org>  Thu, 04 Nov 2021 07:57:35 +0100
+ -- Andreas Tille <tille at debian.org>  Thu, 04 Nov 2021 09:29:04 +0100
 
 python-cogent (2021.5.7a+dfsg-3) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -7,6 +7,7 @@ Testsuite: autopkgtest-pkg-python
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                dh-python,
+               flit,
                python3-all-dev,
                python3-matplotlib,
                python3-numba,
@@ -15,7 +16,6 @@ Build-Depends: debhelper-compat (= 13),
                python3-scitrack,
                python3-tqdm,
                python3-tinydb,
-               python3-setuptools,
                python3-sphinx,
                python3-numpydoc,
                python3-nbsphinx,


=====================================
debian/patches/py39_union_dict deleted
=====================================
@@ -1,28 +0,0 @@
-From: Michael R. Crusoe <crusoe at debian.org>
-Subject: Add Python 3.9 compatibility
-Forwarded: https://github.com/cogent3/cogent3/pull/850
---- a/src/cogent3/util/union_dict.py
-+++ b/src/cogent3/util/union_dict.py
-@@ -1,6 +1,7 @@
- """UnionDict extension of dict.
- """
- 
-+import sys
- 
- __author__ = "Thomas La"
- __copyright__ = "Copyright 2007-2021, The Cogent Project"
-@@ -68,6 +69,14 @@ class UnionDict(dict):
-         self.union(other)
-         return self
- 
-+    if sys.version_info[:2] == (3, 9):
-+        def __ror__(self, other):
-+            other.union(self)
-+            return other
-+
-+        def __ior__(self, other):
-+            return self.__or__(other)
-+
-     def union(self, other):
-         """returns the union of self with other
- 


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,2 @@
 sphinx.patch
 fix_interpreter.patch
-# py39_union_dict


=====================================
debian/rules
=====================================
@@ -16,6 +16,8 @@ endif
 
 include /usr/share/dpkg/default.mk
 
+export PYBUILD_SYSTEM=flit
+
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 



View it on GitLab: https://salsa.debian.org/med-team/python-cogent/-/compare/89308b18645844efe18d8253b8a029cb74e75568...4cf1d6704c22a9e9686d3281e3010fc31430eb8d

-- 
View it on GitLab: https://salsa.debian.org/med-team/python-cogent/-/compare/89308b18645844efe18d8253b8a029cb74e75568...4cf1d6704c22a9e9686d3281e3010fc31430eb8d
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/20211104/729d9b66/attachment-0001.htm>