[med-svn] [Git][med-team/q2-dada2][master] 7 commits: routine-update: New upstream version
Michael R. Crusoe (@crusoe)
gitlab at salsa.debian.org
Wed Jun 26 16:30:39 BST 2024
Michael R. Crusoe pushed to branch master at Debian Med / q2-dada2
Commits:
4ebbbf90 by Michael R. Crusoe at 2024-06-26T15:18:22+02:00
routine-update: New upstream version
- - - - -
70a56892 by Michael R. Crusoe at 2024-06-26T15:18:23+02:00
New upstream version 2024.5.0
- - - - -
1adc260b by Michael R. Crusoe at 2024-06-26T15:18:26+02:00
Update upstream source from tag 'upstream/2024.5.0'
Update to upstream version '2024.5.0'
with Debian dir 8999ccf05580a21716bfecc9bd8c33226f05515d
- - - - -
7bb91b04 by Michael R. Crusoe at 2024-06-26T15:18:45+02:00
routine-update: Regenerate debian/control from debian/control.in
- - - - -
a28ef486 by Michael R. Crusoe at 2024-06-26T15:43:23+02:00
d/patches/configparser.patch: copy from qiime
- - - - -
0cb5c8bb by Michael R. Crusoe at 2024-06-26T15:50:31+02:00
Only build for Python 3.11 until upstream catches up with Python 3.12.
- - - - -
4fb1340d by Michael R. Crusoe at 2024-06-26T15:50:32+02:00
routine-update: Ready to upload to unstable
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/control.in
- + debian/patches/configparser.patch
- + debian/patches/series
- debian/rules
- debian/tests/run-unit-test
- q2_dada2/_version.py
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+q2-dada2 (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
+ * Only build for Python 3.11 until upstream catches up with Python
+ 3.12.
+
+ -- Michael R. Crusoe <crusoe at debian.org> Wed, 26 Jun 2024 15:18:45 +0200
+
q2-dada2 (2024.2.0-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -6,9 +6,9 @@ Section: science
Priority: optional
Build-Depends: debhelper-compat (= 13),
dh-sequence-python3,
- python3,
+ python3-all,
python3-setuptools,
- qiime (>= 2024.2),
+ qiime (>= 2024.5),
r-bioc-dada2
Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/med-team/q2-dada2
@@ -24,8 +24,8 @@ Depends: ${shlibs:Depends},
r-base-core,
r-bioc-dada2 (>= 1.24.0+dfsg-2~),
r-cran-optparse,
- qiime (>= 2024.2),
- q2-types (>= 2024.2),
+ qiime (>= 2024.5),
+ q2-types (>= 2024.5),
python3-biom-format,
python3-skbio
Description: QIIME 2 plugin to work with adapters in sequence data
=====================================
debian/control.in
=====================================
@@ -5,7 +5,7 @@ Section: science
Priority: optional
Build-Depends: debhelper-compat (= 13),
dh-sequence-python3,
- python3,
+ python3-all,
python3-setuptools,
qiime (>= @DEB_VERSION_UPSTREAM@),
r-bioc-dada2
=====================================
debian/patches/configparser.patch
=====================================
@@ -0,0 +1,27 @@
+From: Athos Ribeiro <athos.ribeiro at canonical.com>
+Date: Mon, 3 Jun 2024 11:31:54 -0300
+Subject: 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
+
+--- q2-types.orig/versioneer.py
++++ q2-types/versioneer.py
+@@ -340,9 +340,9 @@
+ # 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):
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+configparser.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 to deploy the project in the build directory
# so that qiime2 plugins are loaded
export PYBUILD_BEFORE_TEST=python{version} setup.py develop --install-dir {build_dir}
=====================================
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_dada2/_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 = "84d91b089bceb2330bbaa53e63f82ba25a22c269"
- git_date = "2024-02-16 21:55:57 +0000"
+ git_refnames = " (tag: 2024.5.0, Release-2024.5)"
+ git_full = "f1289a0a3f9c5e56ca9a949f25ec22111b4ae94a"
+ git_date = "2024-05-29 04:13:53 +0000"
keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
return keywords
View it on GitLab: https://salsa.debian.org/med-team/q2-dada2/-/compare/513edd94243f68f9552358caff95306227faf19a...4fb1340d60acd012e174502fa876a2ed40e7b190
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/med-team/q2-dada2/-/compare/513edd94243f68f9552358caff95306227faf19a...4fb1340d60acd012e174502fa876a2ed40e7b190
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/20240626/32b2c26b/attachment-0001.htm>
More information about the debian-med-commit
mailing list