[med-svn] [Git][med-team/q2-types][master] 4 commits: Repack upstream tarball to drop two .dmnd test fixtures with non-free license
Andreas Tille (@tille)
gitlab at salsa.debian.org
Thu Nov 12 20:12:22 GMT 2026
Andreas Tille pushed to branch master at Debian Med / q2-types
Commits:
dc85c2d9 by Andreas Tille at 2026-11-12T21:07:01+01:00
Repack upstream tarball to drop two .dmnd test fixtures with non-free license
- - - - -
5a7470b0 by Andreas Tille at 2026-11-12T21:09:22+01:00
New upstream version 2026.10.0+dfsg
- - - - -
8e53908c by Andreas Tille at 2026-11-12T21:09:30+01:00
Update upstream source from tag 'upstream/2026.10.0+dfsg'
Update to upstream version '2026.10.0+dfsg'
with Debian dir 479b5bc3106b1a7190f224352050660fc95c225c
- - - - -
84f2f393 by Andreas Tille at 2026-11-12T21:11:45+01:00
Do not run tests that were using removed files
- - - - -
7 changed files:
- debian/changelog
- debian/copyright
- + debian/patches/drop-unlicensable-dmnd-fixtures.patch
- debian/patches/series
- debian/watch
- − q2_types/reference_db/tests/data/bad_dmnd_db/bad_name.dmnd
- − q2_types/reference_db/tests/data/dmnd_db/ref_db.dmnd
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-q2-types (2026.10.0-1) UNRELEASED; urgency=medium
+q2-types (2026.10.0+dfsg-1) UNRELEASED; urgency=medium
TODO: https://dfsg-new-queue.debian.org/reviews/q2-types?response_token=ohO24v1K2XS4mMdOR0Q9hoDtpSBj4HCs#maintainer-response
@@ -23,6 +23,8 @@ q2-types (2026.10.0-1) UNRELEASED; urgency=medium
Closes: #1104050
* Add package q2-types-examples
Closes: #1065333
+ * Repack upstream tarball to drop two .dmnd test fixtures with non-free
+ license
-- Andreas Tille <tille at debian.org> Mon, 02 Nov 2026 09:11:22 +0100
=====================================
debian/copyright
=====================================
@@ -1,6 +1,13 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: QIIME 2
Source: https://github.com/qiime2/q2-types/releases
+Files-Excluded:
+ q2_types/reference_db/tests/data/dmnd_db/ref_db.dmnd
+ q2_types/reference_db/tests/data/bad_dmnd_db/bad_name.dmnd
+Comment: Both files were not DIAMOND databases but saved copies of a
+ github.com web page (copyright GitHub, Inc., no licence), hence they are
+ not distributed. Upstream uses them only in tests that exercise an
+ unimplemented validator, so the tarball is repacked as +dfsg without them.
Files: *
Copyright: 2016-2023 QIIME 2 development team
=====================================
debian/patches/drop-unlicensable-dmnd-fixtures.patch
=====================================
@@ -0,0 +1,66 @@
+Author: Andreas Tille <tille at debian.org>
+Description: Drop the unlicensable .dmnd test fixtures
+ The two files q2_types/reference_db/tests/data/{dmnd_db/ref_db,bad_dmnd_db/bad_name}.dmnd
+ are saved copies of a github.com web page (the eggnog-mapper file view,
+ copyright GitHub, Inc. and the eggnog-mapper project) with no licence
+ permitting redistribution, not DIAMOND databases. They are excluded from
+ the repackaged upstream tarball and had to go from the source tree.
+ .
+ test_dmnd_ff and test_dmnd_df only asserted that validation of an
+ arbitrary file passes, which it does by construction because
+ DiamondDatabaseFileFmt._validate_ is a no-op (# TODO: native diamond
+ validation). They are dropped. test_dmnd_dir_fmt_fails_bad_name only
+ checks the required file name of DiamondDatabaseDirFmt, so it now builds
+ its input in a temporary directory instead.
+Forwarded: not-needed
+Last-Update: 2026-11-12
+Assisted-By: aim2balance/a2b-code
+
+--- a/q2_types/reference_db/tests/test_formats.py
++++ b/q2_types/reference_db/tests/test_formats.py
+@@ -5,11 +5,13 @@
+ #
+ # The full license is in the file LICENSE, distributed with this software.
+ # ----------------------------------------------------------------------------
++import os.path
++
+ from qiime2.plugin.testing import TestPluginBase
+ from qiime2.plugin import ValidationError
+
+ from q2_types.reference_db import (
+- DiamondDatabaseFileFmt, DiamondDatabaseDirFmt, EggnogRefBinFileFmt,
++ DiamondDatabaseDirFmt, EggnogRefBinFileFmt,
+ EggnogRefDirFmt, NCBITaxonomyNamesFormat, NCBITaxonomyNodesFormat,
+ NCBITaxonomyDirFmt, NCBITaxonomyBinaryFileFmt,
+ EggnogProteinSequencesDirFmt, EggnogRefTextFileFmt
+@@ -19,28 +21,10 @@ from q2_types.reference_db import (
+ class TestRefFormats(TestPluginBase):
+ package = 'q2_types.reference_db.tests'
+
+- def test_dmnd_ff(self):
+- dmd_obj = DiamondDatabaseFileFmt(
+- self.get_data_path('dmnd_db/ref_db.dmnd'),
+- mode='r'
+- )
+-
+- dmd_obj.validate()
+-
+- def test_dmnd_df(self):
+- dmnd_obj = DiamondDatabaseDirFmt(
+- self.get_data_path('dmnd_db'),
+- mode='r'
+- )
+-
+- dmnd_obj.validate()
+-
+ def test_dmnd_dir_fmt_fails_bad_name(self):
+- dmnd_obj = DiamondDatabaseDirFmt(
++ open(os.path.join(self.temp_dir.name, 'bad_name.dmnd'), 'w').close()
++ dmnd_obj = DiamondDatabaseDirFmt(self.temp_dir.name, mode='r')
+
+- self.get_data_path('bad_dmnd_db'),
+- mode='r'
+- )
+ with self.assertRaisesRegex(
+ ValidationError,
+ "Missing one or more files for DiamondDatabaseDirFmt"):
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
optional-deps.patch
+drop-unlicensable-dmnd-fixtures.patch
=====================================
debian/watch
=====================================
@@ -3,3 +3,5 @@ Version: 5
Template: Github
Dist: https://github.com/qiime2/@PACKAGE@
Custom-Version: (\d[\d.]+)
+Repacksuffix: +dfsg
+Dversion-Mangle: auto
=====================================
q2_types/reference_db/tests/data/bad_dmnd_db/bad_name.dmnd deleted
=====================================
The diff for this file was not included because it is too large.
=====================================
q2_types/reference_db/tests/data/dmnd_db/ref_db.dmnd deleted
=====================================
The diff for this file was not included because it is too large.
View it on GitLab: https://salsa.debian.org/med-team/q2-types/-/compare/8d35a1adc075a4a7b0cb34ca0303a729c57ea40f...84f2f393a159db0c8b3a6dd61c2d9a0dda64e136
--
View it on GitLab: https://salsa.debian.org/med-team/q2-types/-/compare/8d35a1adc075a4a7b0cb34ca0303a729c57ea40f...84f2f393a159db0c8b3a6dd61c2d9a0dda64e136
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/20261112/eeba2779/attachment-0001.htm>
More information about the debian-med-commit
mailing list