[med-svn] [Git][med-team/python-cogent][master] 3 commits: build-dep on python3-pytest to fix the tests

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / python-cogent


Commits:
6d4ce250 by Michael R. Crusoe at 2021-02-07T22:25:02+01:00
build-dep on python3-pytest to fix the tests

- - - - -
1dada633 by Michael R. Crusoe at 2021-02-07T22:25:02+01:00
add Python 3.9 compatibility

- - - - -
41fe85ad by Michael R. Crusoe at 2021-02-07T22:25:03+01:00
routine-update: Ready to upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- + debian/patches/py39_union_dict
- debian/patches/series
- debian/patches/sphinx.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,6 @@
-python-cogent (2020.12.21a+dfsg-1) UNRELEASED; urgency=medium
+python-cogent (2020.12.21a+dfsg-1) unstable; urgency=medium
+
+  * Team upload.
 
   [ Andreas Tille ]
   * New upstream version
@@ -7,8 +9,10 @@ python-cogent (2020.12.21a+dfsg-1) UNRELEASED; urgency=medium
 
   [ Michael R. Crusoe ]
   * debian/control: build without python3-jupyter-sphinx
+  * build-dep on python3-pytest to fix the tests
+  * Add patch to give Python 3.9 compatibility
 
- -- Andreas Tille <tille at debian.org>  Tue, 26 Jan 2021 11:25:08 +0100
+ -- Michael R. Crusoe <crusoe at debian.org>  Sun, 07 Feb 2021 21:40:21 +0100
 
 python-cogent (2020.6.30a0+dfsg-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -22,6 +22,7 @@ Build-Depends: debhelper-compat (= 13),
                python3-sphinx-bootstrap-theme,
                python3-sphinx-gallery,
                python3-sphinxcontrib.bibtex,
+               python3-pytest <!nocheck>,
                cython3,
                pandoc
 Standards-Version: 4.5.1


=====================================
debian/patches/py39_union_dict
=====================================
@@ -0,0 +1,29 @@
+From: Michael R. Crusoe <crusoe at debian.org>
+Subject: Add Python 3.9 compatibility
+Forwarded: https://github.com/cogent3/cogent3/pull/850
+--- python-cogent.orig/src/cogent3/util/union_dict.py
++++ python-cogent/src/cogent3/util/union_dict.py
+@@ -2,7 +2,7 @@
+ """UnionDict extension of dict.
+ """
+ from cogent3.util.misc import extend_docstring_from
+-
++import sys
+ 
+ __author__ = "Thomas La"
+ __copyright__ = "Copyright 2007-2020, The Cogent Project"
+@@ -64,6 +64,14 @@
+         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,2 +1,3 @@
 sphinx.patch
 fix_interpreter.patch
+py39_union_dict


=====================================
debian/patches/sphinx.patch
=====================================
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- python-cogent.orig/doc/conf.py
 +++ python-cogent/doc/conf.py
-@@ -18,18 +18,19 @@
+@@ -19,18 +19,19 @@
  numpydoc_class_members_toctree = False
  
  extensions = [


=====================================
debian/rules
=====================================
@@ -7,7 +7,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 
 export PYBUILD_BEFORE_TEST=cp -r {dir}/tests/data {build_dir}
-
+export PYBUILD_TEST_PYTEST=1
 export PYBUILD_NAME=cogent3
 
 include /usr/share/dpkg/default.mk



View it on GitLab: https://salsa.debian.org/med-team/python-cogent/-/compare/865b350783a4a7b870ab67536edf27cea7459a09...41fe85ad208d3c3eeafe353061222a7892dd846f

-- 
View it on GitLab: https://salsa.debian.org/med-team/python-cogent/-/compare/865b350783a4a7b870ab67536edf27cea7459a09...41fe85ad208d3c3eeafe353061222a7892dd846f
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/20210207/4f7a6dd0/attachment-0001.html>