[med-svn] [Git][med-team/qiime][master] 2 commits: Fix source package build failing on stray versioningit output
Andreas Tille (@tille)
gitlab at salsa.debian.org
Mon Nov 2 08:20:41 GMT 2026
Andreas Tille pushed to branch master at Debian Med / qiime
Commits:
7086cd7d by Andreas Tille at 2026-11-02T08:30:34+01:00
Fix source package build failing on stray versioningit output
use-static-version.patch created src/rachis/_version.py, a path listed in
upstream .gitignore. A copy left behind by the upstream development
workflow was therefore invisible to git but present in the tree, and patch
failed with 'The next patch would create the file ..., which already
exists', aborting the source package build before debhelper ran.
Set the version in the package __init__ instead of creating a new file, and
teach dpkg-source to ignore the generated path so that a leftover copy can
no longer break the build.
- - - - -
29e343f5 by Andreas Tille at 2026-11-02T09:19:33+01:00
Conflicts, Provides, Replaces: qiime
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/patches/series
- debian/patches/use-static-version.patch
- + debian/source/options
Changes:
=====================================
debian/changelog
=====================================
@@ -20,6 +20,7 @@ rachis (2026.10.0-1) UNRELEASED; urgency=medium
* Standards-Version: 4.7.4
* Set upstream metadata fields: Repository, Repository-Browse.
* cme fix dpkg-control
+ * Conflicts, Provides, Replaces: qiime
-- Andreas Tille <tille at debian.org> Sun, 22 Feb 2026 13:02:47 +0100
=====================================
debian/control
=====================================
@@ -31,7 +31,6 @@ Build-Depends:
Vcs-Browser: https://salsa.debian.org/med-team/qiime
Vcs-Git: https://salsa.debian.org/med-team/qiime.git
Homepage: https://qiime2.org
-Rules-Requires-Root: no
Package: rachis
Architecture: all
@@ -65,6 +64,9 @@ Recommends:
q2-types,
q2cli,
q2templates,
+Conflicts: qiime (<= 2025.10.0)
+Replaces: qiime
+Provides: qiime
Description: framework for microbiome analysis (formerly QIIME 2)
Rachis is a powerful, extensible, and decentralized microbiome analysis
framework with a focus on data and analysis transparency. It was formerly
=====================================
debian/patches/series
=====================================
@@ -1,4 +1,3 @@
-
relax-mkdir-calls.patch
fix-hidden-test-data-path.patch
skip-unavailable-tests.patch
=====================================
debian/patches/use-static-version.patch
=====================================
@@ -1,8 +1,7 @@
Description: use a static version instead of versioningit
versioningit is not packaged for Debian and cannot be fetched during a
- package build. Set the upstream release version statically and provide the
- generated version module, so that no versioningit build dependency is
- required.
+ package build. Set the upstream release version statically in the package
+ __init__, so that no versioningit build dependency is required.
Forwarded: not-needed
Last-Update: 2026-11-01
Assisted-By: DeepSeek V4.1 Flash Free
@@ -46,7 +45,17 @@ Assisted-By: DeepSeek V4.1 Flash Free
[tool.setuptools]
include-package-data = true
---- /dev/null
-+++ b/src/rachis/_version.py
-@@ -0,0 +1 @@
-+__version__ = "2026.10.0"
+--- a/src/rachis/__init__.py
++++ b/src/rachis/__init__.py
+@@ -14,10 +14,7 @@
+ from rachis.core.annotate import Note
+ import rachis.util as util
+
+-try:
+- from ._version import __version__
+-except ModuleNotFoundError:
+- __version__ = '0.0.0+notfound'
++__version__ = '2026.10.0'
+
+ # "Train release" version includes <year>.<month> and excludes patch numbers
+ # and pre/post-release tags. All versions within a train release are expected
=====================================
debian/source/options
=====================================
@@ -0,0 +1,5 @@
+# versioningit (used by the upstream development workflow) generates
+# src/rachis/_version.py; the file is listed in upstream .gitignore, so a
+# leftover copy is invisible to git but would otherwise abort the source
+# package build. The file is not needed for the Debian build.
+extend-diff-ignore = ^src/rachis/_version\.py$
View it on GitLab: https://salsa.debian.org/med-team/qiime/-/compare/89126a6d08fd9930a4b70a347d0d6429244f8034...29e343f5757387d5066a96ab2e63eaf77693dd07
--
View it on GitLab: https://salsa.debian.org/med-team/qiime/-/compare/89126a6d08fd9930a4b70a347d0d6429244f8034...29e343f5757387d5066a96ab2e63eaf77693dd07
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/20261102/7d42f8c1/attachment-0001.htm>
More information about the debian-med-commit
mailing list