[med-svn] [Git][med-team/q2-fragment-insertion][master] 7 commits: routine-update: New upstream version
Michael R. Crusoe (@crusoe)
gitlab at salsa.debian.org
Tue Jun 25 11:59:45 BST 2024
Michael R. Crusoe pushed to branch master at Debian Med / q2-fragment-insertion
Commits:
a40537a4 by Michael R. Crusoe at 2024-06-25T12:44:36+02:00
routine-update: New upstream version
- - - - -
6313cc22 by Michael R. Crusoe at 2024-06-25T12:44:37+02:00
New upstream version 2024.5.0
- - - - -
f81e6c15 by Michael R. Crusoe at 2024-06-25T12:44:38+02:00
Update upstream source from tag 'upstream/2024.5.0'
Update to upstream version '2024.5.0'
with Debian dir 9f2e806d4393a4010206259fddda44a3021046d0
- - - - -
9ae5266a by Michael R. Crusoe at 2024-06-25T12:45:31+02:00
routine-update: Regenerate debian/control from debian/control.in
- - - - -
349993cf by Michael R. Crusoe at 2024-06-25T12:53:56+02:00
d/patches/configparser.patch: copy from qiime packaging
- - - - -
25c1c76b by Michael R. Crusoe at 2024-06-25T12:53:56+02:00
Only build for Python 3.11 until upstream catches up with Python 3.12.
- - - - -
3a3c7716 by Michael R. Crusoe at 2024-06-25T12:53:57+02:00
routine-update: Ready to upload to unstable
- - - - -
7 changed files:
- debian/changelog
- debian/control
- + debian/patches/configparser.patch
- debian/patches/series
- debian/rules
- debian/tests/run-unit-test
- q2_fragment_insertion/_version.py
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+q2-fragment-insertion (2024.5.0-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream version
+ * Regenerate debian/control from debian/control.in (routine-update)
+ * d/patches/configparser.patch: copy from qiime packaging
+ * Only build for Python 3.11 until upstream catches up with Python
+ 3.12.
+
+ -- Michael R. Crusoe <crusoe at debian.org> Tue, 25 Jun 2024 12:45:32 +0200
+
q2-fragment-insertion (2024.2.0-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -7,9 +7,9 @@ Section: science
Priority: optional
Build-Depends: debhelper-compat (= 13),
dh-sequence-python3,
- python3,
+ python3-all,
python3-setuptools,
- qiime (>= 2024.2),
+ qiime (>= 2024.5),
python3-pytest <!nocheck>,
python3-pytest-cov <!nocheck>,
python3-biom-format <!nocheck>,
@@ -27,8 +27,8 @@ Depends: ${shlibs:Depends},
${python3:Depends},
python3-biom-format,
python3-skbio,
- qiime (>= 2024.2),
- q2-types (>= 2024.2)
+ qiime (>= 2024.5),
+ q2-types (>= 2024.5)
Recommends: sepp,
python3-ijson,
default-jdk
=====================================
debian/patches/configparser.patch
=====================================
@@ -0,0 +1,35 @@
+From: Athos Ribeiro <athos.ribeiro at canonical.com>
+Date: Mon, 3 Jun 2024 11:31:54 -0300
+Subject: [PATCH] Use ConfigParser instead of SafeConfigParser
+
+The configparser's SafeConfigParser has been renamed to ConfigParser in
+Python 3.2 [1]. It was finally removed in Python 3.12 [2].
+
+[1] https://docs.python.org/dev/whatsnew/3.2.html#configparser
+[2] https://docs.python.org/3/whatsnew/3.12.html#configparser
+
+Last-Update: 2024-06-03
+Forwarded: not-needed, see https://github.com/qiime2/q2-sample-classifier/pull/229
+---
+ versioneer.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/versioneer.py b/versioneer.py
+index a5e7a20..886455f 100644
+--- a/versioneer.py
++++ b/versioneer.py
+@@ -340,9 +340,9 @@ def get_config_from_root(root):
+ # configparser.NoOptionError (if it lacks "VCS="). See the docstring at
+ # the top of versioneer.py for instructions on writing your setup.cfg .
+ setup_cfg = os.path.join(root, "setup.cfg")
+- parser = configparser.SafeConfigParser()
++ parser = configparser.ConfigParser()
+ with open(setup_cfg, "r") as f:
+- parser.readfp(f)
++ parser.read_file(f)
+ VCS = parser.get("versioneer", "VCS") # mandatory
+
+ def get(parser, name):
+--
+2.43.0
+
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
+configparser.patch
python2to3.patch
sepp_not_in_testing.patch
=====================================
debian/rules
=====================================
@@ -3,6 +3,8 @@
# DH_VERBOSE := 1
export LC_ALL=C.UTF-8
+export PYBUILD_DISABLE=python3.12
+
# For testing, we need .egg-info so the entry points are available.
export PYBUILD_BEFORE_TEST=python{version} setup.py develop --install-dir {build_dir}
# Delete .egg-info and other files that were generated along with .egg-info
=====================================
debian/tests/run-unit-test
=====================================
@@ -18,7 +18,9 @@ if [ ! -f /usr/lib/python3/dist-packages/pytest_cov/__init__.py ] ; then
fi
# Run build-time tests
-for py in $(py3versions -s 2> /dev/null)
-do
- ${py} -m pytest -v --cov=${pkg}
-done
+# for py in $(py3versions -s 2> /dev/null)
+# do
+# ${py} -m pytest -v --cov=${pkg}
+# done
+
+python3.11 -m pytest -v --cov=${pkg}
=====================================
q2_fragment_insertion/_version.py
=====================================
@@ -23,9 +23,9 @@ def get_keywords():
# setup.py/versioneer.py will grep for the variable names, so they must
# each be defined on a line of their own. _version.py will just call
# get_keywords().
- git_refnames = " (tag: 2024.2.0, Release-2024.2)"
- git_full = "ac538814710d0feabe680d6411d9cbf7217180a9"
- git_date = "2024-02-16 21:58:03 +0000"
+ git_refnames = " (tag: 2024.5.0, Release-2024.5)"
+ git_full = "6751dfd4df443d26dc89eefeea2a4aafc5c38a67"
+ git_date = "2024-05-29 04:16:18 +0000"
keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
return keywords
View it on GitLab: https://salsa.debian.org/med-team/q2-fragment-insertion/-/compare/9050cd3d129fdba9db1e75981d7517fc797ed4e5...3a3c7716188a486073a0b8cebf9c83c1a56ebb79
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/med-team/q2-fragment-insertion/-/compare/9050cd3d129fdba9db1e75981d7517fc797ed4e5...3a3c7716188a486073a0b8cebf9c83c1a56ebb79
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/20240625/8011308a/attachment-0001.htm>
More information about the debian-med-commit
mailing list