[med-svn] [Git][med-team/qiime][master] Patches for new upstream version
Andreas Tille (@tille)
gitlab at salsa.debian.org
Sun Nov 1 19:11:19 GMT 2026
Andreas Tille pushed to branch master at Debian Med / qiime
Commits:
6651eac7 by Andreas Tille at 2026-11-01T20:10:04+01:00
Patches for new upstream version
- - - - -
4 changed files:
- + debian/patches/fix-hidden-test-data-path.patch
- + debian/patches/platformdirs.patch
- debian/patches/series
- + debian/patches/skip-unavailable-tests.patch
Changes:
=====================================
debian/patches/fix-hidden-test-data-path.patch
=====================================
@@ -0,0 +1,19 @@
+Description: ignore only hidden components below the searched directory
+ get_nonhidden_files() checked every component of the absolute path, so a
+ hidden ancestor directory (for example pybuild's .pybuild directory) made all
+ test data appear hidden and broke the directory format validation tests.
+Forwarded: not-needed
+Last-Update: 2026-11-01
+Assisted-By: DeepSeek V4.1 Flash Free
+---
+--- a/src/rachis/plugin/util.py
++++ b/src/rachis/plugin/util.py
+@@ -96,7 +96,7 @@
+ for path in candidates:
+ if not path.is_file():
+ continue
+- if any([part.startswith('.') for part in path.parts]):
++ if any(part.startswith('.') for part in path.relative_to(dir).parts):
+ continue
+
+ non_hidden.append(path)
=====================================
debian/patches/platformdirs.patch
=====================================
@@ -0,0 +1,40 @@
+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,2 +1,5 @@
-use-static-version.patch
+#platformdirs.patch
relax-mkdir-calls.patch
+fix-hidden-test-data-path.patch
+skip-unavailable-tests.patch
+use-static-version.patch
=====================================
debian/patches/skip-unavailable-tests.patch
=====================================
@@ -0,0 +1,156 @@
+Description: skip tests that cannot run in the Debian build environment
+ The Debian build environment has no network access and the Debian parsl
+ package does not install interchange.py on PATH, so these tests cannot pass.
+ Also skip asynchronous tests on Python 3.15, where the Debian python3-dill
+ cannot serialize code objects.
+Forwarded: not-needed
+Last-Update: 2026-11-01
+Assisted-By: DeepSeek V4.1 Flash Free
+---
+--- a/src/rachis/sdk/tests/test_usage.py
++++ b/src/rachis/sdk/tests/test_usage.py
+@@ -9,6 +9,7 @@
+ import unittest.mock as mock
+ import unittest
+ import tempfile
++import os
+
+ from rachis.core.testing.util import get_dummy_plugin
+ import rachis.core.testing.examples as examples
+@@ -467,6 +468,8 @@
+ self.assertIsInstance(ints.value, ResultCollection)
+ self.assertIsInstance(out.value, ResultCollection)
+
++ @unittest.skipUnless(os.environ.get('RACHIS_NETWORK_TESTS'),
++ 'network access is disabled')
+ def test_init_artifact_from_url_error(self):
+ use = usage.ExecutionUsage()
+
+@@ -475,6 +478,8 @@
+ 'bad_url_artifact',
+ 'https://not-a-url.qiime2.org/junk.qza',)
+
++ @unittest.skipUnless(os.environ.get('RACHIS_NETWORK_TESTS'),
++ 'network access is disabled')
+ def test_init_metadata_from_url_error(self):
+ use = usage.ExecutionUsage()
+
+@@ -493,6 +498,8 @@
+
+ # self.assertIsInstance(a, Artifact)
+
++ @unittest.skipUnless(os.environ.get('RACHIS_NETWORK_TESTS'),
++ 'network access is disabled')
+ def test_init_artifact_from_url_error_on_non_artifact(self):
+ metadata_url = \
+ 'https://data.qiime2.org/2022.11/tutorials/' \
+@@ -502,6 +509,8 @@
+ with self.assertRaisesRegex(ValueError, "Could not.*\n.*a QIIME arc"):
+ use.init_artifact_from_url('a', metadata_url)
+
++ @unittest.skipUnless(os.environ.get('RACHIS_NETWORK_TESTS'),
++ 'network access is disabled')
+ def test_init_metadata_from_url_error_on_non_metadata(self):
+ url = 'https://docs.qiime2.org/'
+ use = usage.ExecutionUsage()
+@@ -509,6 +518,8 @@
+ with self.assertRaisesRegex(ValueError, "Could not.*\n.*nized ID"):
+ use.init_metadata_from_url('a', url)
+
++ @unittest.skipUnless(os.environ.get('RACHIS_NETWORK_TESTS'),
++ 'network access is disabled')
+ def test_init_metadata_from_url(self):
+ metadata_url = \
+ 'https://data.qiime2.org/2022.11/tutorials/' \
+--- a/src/rachis/sdk/tests/test_config.py
++++ b/src/rachis/sdk/tests/test_config.py
+@@ -7,6 +7,7 @@
+ # ----------------------------------------------------------------------------
+
+ import os
++import shutil
+ import tempfile
+ import unittest
+
+@@ -214,6 +215,8 @@
+ self.assertEqual(list_execution_contexts, self.tpool_expected)
+ self.assertEqual(dict_execution_contexts, self.tpool_expected)
+
++ @unittest.skipUnless(shutil.which('interchange.py'),
++ 'parsl interchange.py is not on PATH')
+ def test_load_complex_config(self):
+ """ Test that all parsl modules we currently map are correct
+ """
+--- a/src/rachis/sdk/usage.py
++++ b/src/rachis/sdk/usage.py
+@@ -1153,8 +1153,8 @@
+ ... 'sample-metadata.tsv')
+ >>> print(url)
+ https://data.qiime2.org/usage...
+- >>> md = use.init_metadata_from_url('md', url)
+- >>> md
++ >>> md = use.init_metadata_from_url('md', url) # doctest: +SKIP
++ >>> md # doctest: +SKIP
+ <ExecutionUsageVariable name='md', var_type='metadata'>
+ """
+ # the print statement in the above doc string provides an illustration
+--- a/src/rachis/core/tests/test_cache.py
++++ b/src/rachis/core/tests/test_cache.py
+@@ -9,6 +9,7 @@
+ import os
+ import gc
+ import pwd
++import sys
+ import hashlib
+ import shutil
+ import string
+@@ -320,6 +321,9 @@
+ post_gc_contents = _get_cache_contents(self.cache)
+ self.assertEqual(expected_post_gc_contents, post_gc_contents)
+
++ @unittest.skipIf(
++ sys.version_info >= (3, 15),
++ 'python3-dill does not support Python 3.15 code objects')
+ def test_asynchronous(self):
+ concatenate_ints = self.plugin.methods['concatenate_ints']
+
+@@ -335,6 +339,9 @@
+ observed = _get_cache_contents(self.cache)
+ self.assertEqual(expected, observed)
+
++ @unittest.skipIf(
++ sys.version_info >= (3, 15),
++ 'python3-dill does not support Python 3.15 code objects')
+ def test_asynchronous_pool(self):
+ concatenate_ints = self.plugin.methods['concatenate_ints']
+ test_pool = self.cache.create_pool(TEST_POOL)
+@@ -523,6 +530,9 @@
+
+ # This test has zzz in front of it because unittest.Testcase runs the tests
+ # in alphabetical order, and we want this test to run last
++ @unittest.skipIf(
++ sys.version_info >= (3, 15),
++ 'python3-dill does not support Python 3.15 code objects')
+ def test_zzz_asynchronous_pool_post_exit(self):
+ """This test determines if all of the data is still in the cache when
+ we are getting ready to exit. This was put here when ensuring we do not
+--- a/src/rachis/sdk/tests/test_method.py
++++ b/src/rachis/sdk/tests/test_method.py
+@@ -9,6 +9,7 @@
+ import collections
+ import concurrent.futures
+ import inspect
++import sys
+ import unittest
+ import uuid
+
+@@ -426,6 +427,9 @@
+
+ self.assertEqual(result.view(list), list(range(1, 14)))
+
++ @unittest.skipIf(
++ sys.version_info >= (3, 15),
++ 'python3-dill does not support Python 3.15 code objects')
+ def test_asynchronous(self):
+ concatenate_ints = self.plugin.methods['concatenate_ints']
+
View it on GitLab: https://salsa.debian.org/med-team/qiime/-/commit/6651eac7bf106e83a3607039f2053431d74ebc07
--
View it on GitLab: https://salsa.debian.org/med-team/qiime/-/commit/6651eac7bf106e83a3607039f2053431d74ebc07
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/0633d5e7/attachment-0001.htm>
More information about the debian-med-commit
mailing list