[med-svn] [Git][med-team/qiime][master] 7 commits: Cleanup (Build-)Depends from old qiime package
Andreas Tille (@tille)
gitlab at salsa.debian.org
Wed Nov 11 10:09:18 GMT 2026
Andreas Tille pushed to branch master at Debian Med / qiime
Commits:
1fdae6d0 by Andreas Tille at 2026-11-11T09:39:22+01:00
Cleanup (Build-)Depends from old qiime package
- - - - -
b8544851 by Andreas Tille at 2026-11-11T09:40:11+01:00
Add hint about nature of this package to long description
- - - - -
a476d5d1 by Andreas Tille at 2026-11-11T10:29:48+01:00
Use dynamic version instead of versioningit
- - - - -
f9f45457 by Andreas Tille at 2026-11-11T10:32:16+01:00
Run the upstream test suite during the build
- - - - -
0fa78980 by Andreas Tille at 2026-11-11T10:33:24+01:00
Drop now unneeded lintian-overrides
- - - - -
691b0794 by Andreas Tille at 2026-11-11T10:34:31+01:00
Add README.Debian
- - - - -
2d0da867 by Andreas Tille at 2026-11-11T11:07:06+01:00
Update run-unit-test
- - - - -
9 changed files:
- debian/changelog
- debian/control
- − debian/lintian-overrides
- + debian/patches/series
- + debian/patches/setuptools-dynamic-version.patch
- + debian/pybuild.testfiles
- debian/qiime.README.Debian
- debian/rules
- debian/tests/run-unit-test
Changes:
=====================================
debian/changelog
=====================================
@@ -14,6 +14,13 @@ qiime (2026.10.0-1) UNRELEASED; urgency=medium
* Replace FSF postal address with a reference to
https://www.gnu.org/licenses/.
* Set upstream metadata fields: Repository, Repository-Browse.
+ * Cleanup (Build-)Depends from old qiime package
+ * Add hint about nature of this package to long description
+ * Use dynamic version instead of versioningit
+ * Run the upstream test suite during the build
+ * Drop now unneeded lintian-overrides
+ * Add README.Debian
+ * Update run-unit-test
-- Andreas Tille <tille at debian.org> Tue, 10 Nov 2026 20:04:57 +0100
=====================================
debian/control
=====================================
@@ -10,20 +10,12 @@ Section: science
Build-Depends:
debhelper-compat (= 14),
dh-sequence-python3,
+ dh-sequence-single-binary,
pybuild-plugin-pyproject,
python3-all,
- python3-bibtexparser <!nocheck>,
- python3-decorator <!nocheck>,
- python3-dill <!nocheck>,
- python3-lxml <!nocheck>,
- python3-networkx <!nocheck>,
- python3-pandas <!nocheck>,
- python3-parsl <!nocheck>,
- python3-platformdirs <!nocheck>,
python3-pytest <!nocheck>,
python3-setuptools,
- python3-tzlocal <!nocheck>,
- python3-yaml <!nocheck>,
+ rachis <!nocheck>,
Vcs-Browser: https://salsa.debian.org/med-team/qiime
Vcs-Git: https://salsa.debian.org/med-team/qiime.git
Homepage: https://qiime2.org
@@ -31,25 +23,8 @@ Homepage: https://qiime2.org
Package: qiime
Architecture: all
Depends:
- python3-bibtexparser,
- python3-dateutil,
- python3-decorator,
- python3-dill,
- python3-flufl.lock,
- python3-lxml,
- python3-networkx,
- python3-pandas,
- python3-parsl,
- python3-platformdirs,
- python3-psutil,
- python3-pyparsing,
- python3-setuptools,
- python3-tomlkit,
- python3-tzlocal,
- python3-yaml,
- ${misc:Depends},
+ rachis,
${python3:Depends},
- ${shlibs:Depends},
Recommends:
q2-cutadapt,
q2-demux,
@@ -88,3 +63,6 @@ Description: Quantitative Insights Into Microbial Ecology
can view a list of plugins that are currently available on the QIIME 2 plugin
availability page. The future plugins page lists plugins that are being
developed.
+ .
+ This package is a compatibility shim providing the historical `qiime2` import
+ path for the rachis framework.
=====================================
debian/lintian-overrides deleted
=====================================
@@ -1,2 +0,0 @@
-# These files are test data with national encoding on purpose.
-qiime binary: national-encoding */qiime2/metadata/tests/data/invalid/*
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+setuptools-dynamic-version.patch
=====================================
debian/patches/setuptools-dynamic-version.patch
=====================================
@@ -0,0 +1,45 @@
+Description: use setuptools' dynamic version instead of versioningit
+ versioningit is not packaged for Debian and cannot be fetched during a
+ package build. Without it the version falls back to 0.0.0.
+ .
+ Drop the versioningit build requirement and its configuration, and read
+ the version from qiime2._version instead. That module is generated from
+ debian/changelog by debian/rules, so it always matches the package
+ version and needs no maintenance on upstream bumps.
+Author: Andreas Tille <tille at debian.org>
+Forwarded: not-needed
+Last-Update: 2026-11-11
+Assisted-By: aim2balance/a2b-code
+---
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -29,27 +29,13 @@
+ [build-system]
+ requires = [
+ "setuptools",
+- "versioningit",
+ "wheel"
+ ]
+ build-backend = "setuptools.build_meta"
+
+-[tool.versioningit.vcs]
+-method = "git-archive"
+-describe-subst = "2026.10.0"
+-default-tag = "0.0.1"
++[tool.setuptools.dynamic]
++version = {attr = "qiime2._version.__version__"}
+
+-[tool.versioningit.next-version]
+-method = "minor"
+-
+-[tool.versioningit.format]
+-distance = "{base_version}+{distance}.{vcs}{rev}"
+-dirty = "{base_version}+{distance}.{vcs}{rev}.dirty"
+-distance-dirty = "{base_version}+{distance}.{vcs}{rev}.dirty"
+-
+-[tool.versioningit.write]
+-file = "src/qiime2/_version.py"
+-
+ [tool.setuptools]
+ include-package-data = true
+
=====================================
debian/pybuild.testfiles
=====================================
@@ -0,0 +1,3 @@
+hooks
+tests
+pyproject.toml
=====================================
debian/qiime.README.Debian
=====================================
@@ -1,51 +1,17 @@
-Quick Start
-===========
+QIIME 2 for Debian
+==================
-Type 'qiime' at the shell prompt before running any of the standard
-qiime commands.
+This package provides the `qiime2` Python module from the q2 repository. It
+is a compatibility shim: the framework itself now lives in the `rachis`
+module, and `qiime2.core.*` is an alias for `rachis.core.*` so that plugins
+using the historical import path keep working.
-QIIME for Debian and Ubuntu
-===========================
+The package ships no `qiime` command line tool. The `qiime2` entry point
+generated by upstream imports the unpackaged `rachis_cli` module; install the
+`q2cli` package instead, which provides `/usr/bin/qiime`.
-QIIME is a very powerful environment, but the core of its power stems
-from the tools underneath.
+Plugins
+-------
-Not all those tools that QIIME can work with are yet available with
-Debian. If you find resources to help - please do.
-
-Most of the needed tools are available via the Bio-Linux project:
-http://nebc.nerc.ac.uk/tools/bio-linux . This package was one of the
-first to profit from now joint forces on getting the packages to a
-best-possible shape for everyone.
-
-The package is in experimental since:
- * it depends on python-pynast that is in experimental - and since like
- pynast it uses the sphinx documentation system that it not yet uses
- to streamline the orig.tar.gz and recreate the documentation from
- its sources. When adding python-sphinx the build fails because of
- a conflict to orig.tar.gz that could not yet be resolved.
- * qiime still lacks a man page
-
-The distribution is set to contrib because of
- * the strong recommends to use uclust that is not shipped with
- Debian as a binary only package with a restrictive license.
-
-
-Disambiguation of versions in bio-linux, Debian and Ubuntu
-----------------------------------------------------------
-
-The conflict reports in the control file is originally indicated against
-bio-linux-qiime (<= bl1.1.x). The prefix "bl" is unfortunate since the
-Debian packaging tools demand (and the Debian policy) demand the version
-to start with a number, not a character. The version is now removed from
-that indicated conflict.
-
-Depending on who was performing the last editing of the package, versions
-are either specified with a suffix "-N", N numeric, for uploads to Debian,
-or with the suffix "-ubuntuN". The changelog shall show the Ns to increase
-and be reset for new upstream versions. This is yet slightly different
-from the common practice to have the Ubuntu version keep the last Debian
-version (or start a new one as 0) and have the version extended to
-"NubuntuM" with M reset to 1 with every new Debian version. Either way
-makes sense. The current approach indicates better that some upload
-to Debian may not yet have happened.
+Most QIIME 2 functionality is provided by separate plugin packages, listed in
+the Recommends field. Installing `qiime` alone gives you the framework only.
=====================================
debian/rules
=====================================
@@ -4,31 +4,20 @@
#export DH_VERBOSE=1
export PYBUILD_NAME = qiime
+export PYBUILD_TEST_PYTEST = 1
include /usr/share/dpkg/default.mk
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-export PYBUILD_DISABLE=python3.12
-
%:
dh $@ --buildsystem=pybuild
-# FIXME: the following hack is commented out, as the tip to solve the QIIMETEST
-# environment variable issue does not seem to work anymore. No tests are run
-# at build time, they are delayed to the autopkgtest step.
-
-## 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}
-## Un-deploy the project and delete site.py script
-#export PYBUILD_AFTER_TEST=rm -v {build_dir}/site.py; \
-# python{version} setup.py develop --uninstall --install-dir {build_dir}
-
-override_dh_auto_test:
-#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-# LC_ALL=C.UTF-8 dh_auto_test -- -s custom --test-args="cd {build_dir}; QIIMETEST= pytest-3"
-#endif
+override_dh_auto_install:
+ dh_auto_install --destdir=debian/qiime
+ # The generated entry point imports rachis_cli, which is not packaged yet;
+ # q2cli already ships a working /usr/bin/qiime.
+ rm -f debian/qiime/usr/bin/qiime
override_dh_auto_clean:
dh_auto_clean
=====================================
debian/tests/run-unit-test
=====================================
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
set -e
pkg=qiime
@@ -12,7 +12,9 @@ if [ "$(dpkg-architecture -q DEB_HOST_ARCH_BITS)" = "32" ] ; then
exit 77
fi
-cp -a /usr/lib/python3/dist-packages/${pkg}* "${AUTOPKGTEST_TMP}"
+# tests/test_conda_hooks.py locates the shell hooks relative to the tests
+# directory, so the source layout has to be preserved.
+cp -a hooks tests "${AUTOPKGTEST_TMP}"
cd "${AUTOPKGTEST_TMP}"
@@ -21,5 +23,4 @@ if [ ! -e /usr/bin/pytest-3 ] ; then
exit 1
fi
-# Run build-time tests
-QIIMETEST= python3 -m pytest
+python3 -m pytest -v
View it on GitLab: https://salsa.debian.org/med-team/qiime/-/compare/32be498fede461a9694560ab0efde1a329cd1a15...2d0da867eae336685194cfaf7653685797a7a2cb
--
View it on GitLab: https://salsa.debian.org/med-team/qiime/-/compare/32be498fede461a9694560ab0efde1a329cd1a15...2d0da867eae336685194cfaf7653685797a7a2cb
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20261111/e4b55cbb/attachment-0001.htm>
More information about the debian-med-commit
mailing list