[med-svn] [Git][med-team/qiime][master] 4 commits: back out Python3.12 patch

[Michael R. Crusoe (@crusoe)]

Michael R. Crusoe pushed to branch master at Debian Med / qiime


Commits:
dd551745 by Michael R. Crusoe at 2024-06-24T17:31:59+02:00
back out Python3.12 patch

- - - - -
0df7b194 by Michael R. Crusoe at 2024-06-24T17:43:02+02:00
Only build for Python 3.11 until upstream catches up with Python 3.12.

- - - - -
36d6e4ff by Michael R. Crusoe at 2024-06-24T18:16:37+02:00
d/tests/run-unit-test: likewise, run the unit tests using Python 3.11

- - - - -
91ee24f6 by Michael R. Crusoe at 2024-06-24T18:22:23+02:00
routine-update: Standards-Version: 4.6.2

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/patches/series
- debian/rules
- debian/tests/control
- debian/tests/run-unit-test


Changes:

=====================================
debian/changelog
=====================================
@@ -2,7 +2,6 @@ qiime (2024.5.0-1) UNRELEASED; urgency=medium
 
   [ Andreas Tille ]
   * New upstream version
-  * Fix issue with self._raw_path for Python3.12
   * Standards-Version: 4.7.0 (routine-update)
   * Replace python3-appdirs by python3-platformdirs
     Closes: #1068006
@@ -12,6 +11,11 @@ qiime (2024.5.0-1) UNRELEASED; urgency=medium
 
   [ Michael R. Crusoe ]
   * Added patch to finish migration to platformdirs from appdirs.
+  * d/rules: Only build for Python 3.11 until upstream catches up with
+             Python 3.12.
+  * d/tests/run-unit-test: likewise, run the unit tests using Python
+    3.11
+  * Standards-Version: 4.6.2 (routine-update)
 
  -- Andreas Tille <tille at debian.org>  Thu, 06 Jun 2024 15:33:01 +0200
 


=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                dh-sequence-python3,
-               python3,
+               python3-all,
                python3-setuptools,
                python3-pytest <!nocheck>,
                python3-platformdirs <!nocheck>,
@@ -21,7 +21,7 @@ Build-Depends: debhelper-compat (= 13),
                python3-tzlocal <!nocheck>,
                python3-yaml <!nocheck>,
                python3-networkx <!nocheck>
-Standards-Version: 4.7.0
+Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/med-team/qiime
 Vcs-Git: https://salsa.debian.org/med-team/qiime.git
 Homepage: https://qiime2.org
@@ -46,7 +46,8 @@ Depends: ${shlibs:Depends},
          python3-dateutil,
          python3-networkx,
          python3-psutil,
-         python3-flufl.lock
+         python3-flufl.lock,
+         python3-setuptools
 Recommends: q2cli,
             q2templates,
             q2-cutadapt,


=====================================
debian/patches/series
=====================================
@@ -2,5 +2,5 @@ platformdirs
 python3.8.patch
 enable_decorator_5.patch
 python3.10.patch
-python3.12.patch
+#python3.12.patch  # doesn't work
 configparser.patch


=====================================
debian/rules
=====================================
@@ -9,6 +9,8 @@ include /usr/share/dpkg/default.mk
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+export PYBUILD_DISABLE=python3.12
+
 %:
 	dh $@ --buildsystem=pybuild
 


=====================================
debian/tests/control
=====================================
@@ -1,3 +1,3 @@
 Tests: run-unit-test
-Depends: @, python3-setuptools, python3-pytest, dpkg-dev
+Depends: @, python3-pytest, python3.11
 Restrictions: allow-stderr, skippable


=====================================
debian/tests/run-unit-test
=====================================
@@ -22,4 +22,4 @@ if [ ! -e /usr/bin/pytest-3 ] ; then
 fi
 
 # Run build-time tests
-QIIMETEST= pytest-3
+QIIMETEST= python3.11 -m pytest



View it on GitLab: https://salsa.debian.org/med-team/qiime/-/compare/9ac56e0a3dac450678efcafc3b4c6c51d7760778...91ee24f652a637216c6b8e6a10838c1194f89079

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/med-team/qiime/-/compare/9ac56e0a3dac450678efcafc3b4c6c51d7760778...91ee24f652a637216c6b8e6a10838c1194f89079
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/20240624/8b320425/attachment-0001.htm>