[med-svn] [Git][med-team/qiime][master] 4 commits: Fix build: clean parsl test artifacts and drop obsolete QIIME 1 scripts
Andreas Tille (@tille)
gitlab at salsa.debian.org
Sun Nov 1 21:30:29 GMT 2026
Andreas Tille pushed to branch master at Debian Med / qiime
Commits:
da7a0bcc by Andreas Tille at 2026-11-01T22:20:55+01:00
Fix build: clean parsl test artifacts and drop obsolete QIIME 1 scripts
The parsl pytest run leaves runinfo/ behind in each pybuild build tree.
dh_python3 then refuses to merge the differing runinfo/028/parsl.log files
from the two Python versions into /usr/lib/python3/dist-packages, aborting
the build.
Also drop the QIIME 1 helper scripts, which are dead since the framework
provides no CLI of its own, and refresh the changelog accordingly.
- - - - -
dd11b20f by Andreas Tille at 2026-11-01T22:27:35+01:00
Revert "Add RFP bugs in 1.1.0-1."
This reverts commit 58de128bea78d9cccc48286ed7e77cc7e5e1cce0.
- - - - -
7d529f7c by Andreas Tille at 2026-11-01T22:28:07+01:00
Standards-Version: 4.7.4
- - - - -
89126a6d by Andreas Tille at 2026-11-01T22:28:34+01:00
cme fix dpkg-control
- - - - -
14 changed files:
- debian/changelog
- debian/control
- − debian/patches/platformdirs.patch
- debian/patches/series
- debian/rules
- − debian/scripts/FastTree
- − debian/scripts/ParsInsert
- − debian/scripts/make_emperor.py
- − debian/scripts/qiime
- − debian/scripts/shell/.bashrc
- − debian/scripts/shell/.zshrc
- − debian/scripts/shell/qiime_environment
- − debian/scripts/uclust
- − debian/scripts/usearch
Changes:
=====================================
debian/changelog
=====================================
@@ -3,8 +3,12 @@ rachis (2026.10.0-1) UNRELEASED; urgency=medium
* New upstream version which is now named rachis
Closes: #1084668, #1084668
* Rename remaining Debian packaging from qiime to rachis
+ * Remove obsolete QIIME 1 helper scripts
* Drop platformdirs patch, which was applied upstream
* Use a static version instead of unpackaged versioningit
+ * Fix test data lookup under hidden build directories
+ * Skip tests requiring network access or unavailable parsl/dill support
+ * Clean parsl test artifacts before installation
* Drop python3.11 from explicit Test-Depends
* Do not fail mkdir if directory just exists
* d/watch:
@@ -13,11 +17,9 @@ rachis (2026.10.0-1) UNRELEASED; urgency=medium
* debputy lint --auto-fix (routine-update)
* Build-Depends: pybuild-plugin-pyproject
* d/copyright: Remove old FSF address
- * Standards-Version: 4.7.3 (routine-update)
- * Remove Priority field to comply with Debian Policy 4.7.3 (routine-
- update)
- * Add RFP bugs in 1.1.0-1.
+ * Standards-Version: 4.7.4
* Set upstream metadata fields: Repository, Repository-Browse.
+ * cme fix dpkg-control
-- Andreas Tille <tille at debian.org> Sun, 22 Feb 2026 13:02:47 +0100
@@ -694,6 +696,6 @@ qiime (1.2.1-1) experimental; urgency=low
qiime (1.1.0-1) experimental; urgency=low
- * Initial release. Closes: #587275
+ * Initial release.
-- Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de> Tue, 20 Jul 2010 00:03:02 +0200
=====================================
debian/control
=====================================
@@ -1,31 +1,33 @@
Source: rachis
+Standards-Version: 4.7.4
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Steffen Moeller <moeller at debian.org>,
- Liubov Chuprikova <chuprikovalv at gmail.com>,
- Andreas Tille <tille at debian.org>,
- Étienne Mollier <emollier at debian.org>
+Uploaders:
+ Steffen Moeller <moeller at debian.org>,
+ Liubov Chuprikova <chuprikovalv at gmail.com>,
+ Andreas Tille <tille at debian.org>,
+ Étienne Mollier <emollier at debian.org>,
Section: science
-Build-Depends: debhelper-compat (= 13),
- dh-sequence-python3,
- pybuild-plugin-pyproject,
- python3-all,
- python3-setuptools,
- python3-pytest <!nocheck>,
- python3-flufl.lock <!nocheck>,
- python3-tomlkit <!nocheck>,
- python3-platformdirs <!nocheck>,
- python3-bibtexparser <!nocheck>,
- python3-decorator <!nocheck>,
- python3-dill <!nocheck>,
- python3-lxml <!nocheck>,
- python3-notebook <!nocheck>,
- python3-pandas <!nocheck>,
- python3-parsl <!nocheck>,
- python3-tornado <!nocheck>,
- python3-tzlocal <!nocheck>,
- python3-yaml <!nocheck>,
- python3-networkx <!nocheck>
-Standards-Version: 4.7.3
+Build-Depends:
+ debhelper-compat (= 14),
+ dh-sequence-python3,
+ pybuild-plugin-pyproject,
+ python3-all,
+ python3-bibtexparser <!nocheck>,
+ python3-decorator <!nocheck>,
+ python3-dill <!nocheck>,
+ python3-flufl.lock <!nocheck>,
+ python3-lxml <!nocheck>,
+ python3-networkx <!nocheck>,
+ python3-notebook <!nocheck>,
+ python3-pandas <!nocheck>,
+ python3-parsl <!nocheck>,
+ python3-platformdirs <!nocheck>,
+ python3-pytest <!nocheck>,
+ python3-setuptools,
+ python3-tomlkit <!nocheck>,
+ python3-tornado <!nocheck>,
+ python3-tzlocal <!nocheck>,
+ python3-yaml <!nocheck>,
Vcs-Browser: https://salsa.debian.org/med-team/qiime
Vcs-Git: https://salsa.debian.org/med-team/qiime.git
Homepage: https://qiime2.org
@@ -33,34 +35,36 @@ Rules-Requires-Root: no
Package: rachis
Architecture: all
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${python3:Depends},
- python3-platformdirs,
- python3-bibtexparser,
- python3-decorator,
- python3-dill,
- python3-lxml,
- python3-pandas,
- python3-parsl,
- python3-tomlkit,
- python3-tzlocal,
- python3-yaml,
- python3-pyparsing,
- python3-dateutil,
- python3-networkx,
- python3-psutil,
- python3-flufl.lock,
- python3-setuptools
-Recommends: q2cli,
- q2templates,
- q2-cutadapt,
- q2-types,
- q2-metadata,
- q2-demux,
- q2-quality-filter,
- q2-feature-classifier,
- q2-feature-table
+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},
+ ${python3:Depends},
+ ${shlibs:Depends},
+Recommends:
+ q2-cutadapt,
+ q2-demux,
+ q2-feature-classifier,
+ q2-feature-table,
+ q2-metadata,
+ q2-quality-filter,
+ q2-types,
+ q2cli,
+ q2templates,
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/platformdirs.patch deleted
=====================================
@@ -1,40 +0,0 @@
-From: Michael R. Crusoe <crusoe at debian.org>
-Subject: Switch to platform dirs from appdirs
-Last-Update: 2024-06-24
-Debian-Bug:1068006
-Forwarded: https://github.com/qiime2/qiime2/issues/835
-
-> python3-appdirs is dead upstream[1] and its Debian maintainer has indicated
-> that it should not be included in trixie[2]. A recommended replacement is
-> python3-platformdirs[3], which is a fork of appdirs with a very similar API.
-> [1] https://github.com/ActiveState/appdirs/commit/8734277956c1df3b85385e6b308e954910533884
-> [2] https://bugs.debian.org/1060427
-> [3] https://pypi.org/project/platformdirs/
-
---- a/src/rachis/sdk/parallel_config.py
-+++ b/src/rachis/sdk/parallel_config.py
-@@ -9,7 +9,6 @@
- import os
- import copy
- import psutil
--import appdirs
- import threading
- import importlib
-
-@@ -159,14 +158,14 @@ def _get_vendored_config_path():
- # 2. Check in user writable location
- # appdirs.user_config_dir(appname='qiime2', author='...')
- if os.path.exists(fp_ := os.path.join(
-- appdirs.user_config_dir('qiime2'), 'qiime2_config.toml')):
-+ user_config_dir('qiime2'), 'qiime2_config.toml')):
- config_fp = fp_
- # 3. Check in admin writable location
- # /etc/
- # site_config_dir
- # appdirs.site_config_dir(appname='qiime2, author='...')
- elif os.path.exists(fp_ := os.path.join(
-- appdirs.site_config_dir('qiime2'), 'qiime2_config.toml')):
-+ site_config_dir('qiime2'), 'qiime2_config.toml')):
- config_fp = fp_
- # NOTE: These next two are dependent on us being in a conda environment
- # 4. Check in conda env
=====================================
debian/patches/series
=====================================
@@ -1,4 +1,4 @@
-#platformdirs.patch
+
relax-mkdir-calls.patch
fix-hidden-test-data-path.patch
skip-unavailable-tests.patch
=====================================
debian/rules
=====================================
@@ -16,3 +16,6 @@ export LC_ALL=C.UTF-8
execute_after_dh_auto_clean:
rm -rf rachis.egg-info
+
+execute_after_dh_auto_test:
+ rm -rf .pybuild/*/build/runinfo .pybuild/*/build/.pytest_cache
=====================================
debian/scripts/FastTree deleted
=====================================
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec fasttree "$@"
=====================================
debian/scripts/ParsInsert deleted
=====================================
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec parsinsert "$@"
=====================================
debian/scripts/make_emperor.py deleted
=====================================
@@ -1,10 +0,0 @@
-#!/usr/bin/python
-
-# The make_emperor command on Debian lacks a .py extension
-#exec make_emperor "$@"
-
-# But then if I use a standard shell wrapper I get complaints that the file
-# with a .py extension is not a Python file, so here's a Python equivalent.
-
-import os, sys
-os.execvp("make_emperor", ["make_emperor"] + sys.argv[1:])
=====================================
debian/scripts/qiime deleted
=====================================
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# Set up a Qiime working environment. This should either run the Qiime command directly
-# or else drop the user to a shell where Qiime is ready to run.
-# For now, if $SHELL is zsh use that, otherwise run bash.
-
-if [ "$*" = "" ] ; then
- #Run a shell
- if [ `basename "$SHELL"` = "zsh" ] ; then
- export ZOLDDOTDIR=${ZSHDOTDIR:-~}
- export ZDOTDIR=/usr/lib/qiime/shell
- QIIMESHELL="$SHELL"
- QSNAME="ZSH ($SHELL)"
- elif [ `basename "$SHELL"` = "bash" ] ; then
- #Set bash dot directory.
- QIIMESHELL="$SHELL --rcfile /usr/lib/qiime/shell/.bashrc"
- QSNAME="BASH ($SHELL)"
- else
- if which bash > /dev/null ; then
- QIIMESHELL="bash --rcfile /usr/lib/qiime/shell/.bashrc"
- QSNAME="BASH"
- else
- #This should never happen due to package dependencies.
- echo "To start an interactive QIIME shell, you need to have 'bash' available and"
- echo "in your path."
- exit 1
- fi
- fi
-
-#Determine Qiime version:
-QIIME_VERSION=`/usr/lib/qiime/bin/print_qiime_config.py --version 2>/dev/null | awk '{print $NF}'`
-QIIME_VERSION=${QIIME_VERSION:-UNKNOWN}
-
-echo """
-Setting up $QSNAME environment to run QIIME commands.
-
-You have QIIME version $QIIME_VERSION.
-Note that this will not produce identical results to the official QIIME release
-as it uses updated versions of several tools.
-
-Type 'help' for help, 'print_qiime_config_all' to see the current QIIME
-settings, or 'exit' to return to regular shell.
-"""
-
- eval exec $QIIMESHELL
-
-elif [ "$1" = help ] ; then
- echo "Type 'man qiime' for help."
-else
- #Just run the command
-
- # Set environment
- . /usr/lib/qiime/shell/qiime_environment
-
- cmd=/usr/lib/qiime/bin/`basename "$1" .py`
- shift
-
- [ -e "$cmd" ] || cmd="${cmd}.py"
- exec "$cmd" "$@"
-fi
=====================================
debian/scripts/shell/.bashrc deleted
=====================================
@@ -1,9 +0,0 @@
-# Startup script for BASH with Qiime environment.
-# Source the user's default environent.
-test -e "/etc/bash.bashrc" && source "/etc/bash.bashrc"
-test -e "~/.bashrc" && source "~/.bashrc"
-
-alias help='man qiime'
-
-source /usr/lib/qiime/shell/qiime_environment
-PS1="$PS1 qiime > "
=====================================
debian/scripts/shell/.zshrc deleted
=====================================
@@ -1,11 +0,0 @@
-# Startup script for ZSH with Qiime environment.
-if [ -e "$ZOLDDOTDIR/.zshrc" ] ; then
- source "$ZOLDDOTDIR/.zshrc"
- unset ZOLDDOTDIR
-fi
-
-source /usr/lib/qiime/shell/qiime_environment
-
-alias help='man qiime'
-
-PROMPT="$PROMPT qiime > "
=====================================
debian/scripts/shell/qiime_environment deleted
=====================================
@@ -1,23 +0,0 @@
-#In the /usr/lib/qiime/shell directory are .zshrc and .bashrc files to set up the environment
-#needed for running Qiime. There may be a less hacky way of doing this but it works for now.
-
-# Qiime basic environment. Note that sourcing this file multiple times is not idempotent
-# and should be avoided!
-# This file needs to be readable by /bin/sh and zsh so no bash-isms allowed.
-
-export PYTHONPATH=$PYTHONPATH/:/usr/share/pyshared/qiime
-export PATH="$PATH:/usr/lib/qiime/bin:/usr/lib/qiime/support_files/denoiser/bin/FlowgramAli_4frame"
-export PATH="$PATH:/usr/share/ampliconnoise/Scripts:/usr/lib/ChimeraSlayer"
-export QIIME_HELP_TEXT=/usr/lib/qiime/shell/qiime_help
-export QIIME_CONFIG_FP=${QIIME_CONFIG_FP:-/etc/qiime/qiime_config}
-export BLASTMAT=${BLASTMAT:-/usr/share/ncbi/data}
-
-# This was previously set in bio-linux-rdp-classifier but can now live here
-# as the rdp-classifier package has been normalised.
-export RDP_JAR_PATH=${RDP_JAR_PATH:-/usr/share/rdp-classifier/rdp_classifier.jar}
-#RDP_classifier is very bad at admitting what version it is, so ask DPKG:
-export RDP_JAR_VERSION_OK=`dpkg-query -f '${Version}\n' -W rdp-classifier | sed 's/[~+-].*//'`
-
-# Mike Cox reports these are wanted for Ampliconnoise
-export PYRO_LOOKUP_FILE=${PYRO_LOOKUP_FILE:-/usr/share/ampliconnoise/Data/LookUp_E123.dat}
-export SEQ_LOOKUP_FILE=${SEQ_LOOKUP_FILE:-/usr/share/ampliconnoise/Data/Tran.dat}
=====================================
debian/scripts/uclust deleted
=====================================
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# Added by Tim Booth <tbooth at ceh.ac.uk>
-# QIIME wants very much to use the UClust binary, but this is not free software.
-# However, it is available right now free-of-charge if:
-# a) You are an academic user and only want the 32-bit version.
-# b) You promise to use the UClust application only as part of QIIME.
-#
-# My plan is to put the no-cost UClust into bio-linux-qiime. If someone
-# installs just the reglar QIIME package they need to know what to do...
-
-# See if uclust.real is available.
-if which uclust.real >/dev/null ; then
- exec uclust.real "$@"
-fi
-
-if [ `uname -m` = x86_64 ] ; then
- bits='64-bit'
-else
- bits='32-bit'
-fi
-
-echo """\r\
-UClust is not freely redistributable and is thus not included in the default QIIME package.
-
-To use this feature, please go to:
- http://www.drive5.com/uclust/downloads1_2_22q.html
-
-Download the $bits binary, then:
- sudo cp uclustq1.2.22_* /usr/local/bin/uclust
- sudo chmod a+x /usr/local/bin/uclust
-"""
-exit 1
=====================================
debian/scripts/usearch deleted
=====================================
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# Added by Tim Booth <tbooth at ceh.ac.uk>
-# QIIME wants very much to use the USEARCH binary, but this is not free software.
-# However, it is available right now free-of-charge if you only want the
-# 32-bit version.
-# Redistribution requires a licence, which I could apply for, but then nobody
-# but me can redistribute BL, which is no good!
-
-# See if usearch.real is available anywhere
-if which usearch.real >/dev/null ; then
- exec usearch.real "$@"
-fi
-
-echo """\r\
-USEARCH is not freely redistributable and is thus not included in the
-default QIIME package. The free VSEARCH will be used in place of USEARCH
-where possible, but this does not produce identical results.
-You may obtain a personal copy of the 32-bit USEARCH at no charge.
-
-To use this feature, please go to:
- http://www.drive5.com/usearch/download.html
-
-Download USEARCH v5.2.236, then:
- sudo mv usearch* /usr/local/bin/usearch
- sudo chmod a+x /usr/local/bin/usearch
-
-You probably also want to install USEARCH 6.1 as /usr/local/bin/usearch61
-"""
-exit 1
View it on GitLab: https://salsa.debian.org/med-team/qiime/-/compare/6651eac7bf106e83a3607039f2053431d74ebc07...89126a6d08fd9930a4b70a347d0d6429244f8034
--
View it on GitLab: https://salsa.debian.org/med-team/qiime/-/compare/6651eac7bf106e83a3607039f2053431d74ebc07...89126a6d08fd9930a4b70a347d0d6429244f8034
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/20261101/40a4dd81/attachment-0001.htm>
More information about the debian-med-commit
mailing list