[med-svn] [Git][med-team/qiime][master] 3 commits: add 32-bits.patch to fix autopkgtest regressions

[Étienne Mollier]

Étienne Mollier pushed to branch master at Debian Med / qiime


Commits:
3a5c5051 by Étienne Mollier at 2020-12-01T13:51:46+01:00
add 32-bits.patch to fix autopkgtest regressions

- - - - -
c41b1b02 by Étienne Mollier at 2020-12-01T19:00:53+01:00
override national-encoding on test data

- - - - -
3b30e38c by Étienne Mollier at 2020-12-01T19:03:12+01:00
routine-update: Ready to upload to unstable

- - - - -


4 changed files:

- debian/changelog
- + debian/lintian-overrides
- + debian/patches/32-bits.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-qiime (2020.11.0-1) UNRELEASED; urgency=medium
+qiime (2020.11.0-1) unstable; urgency=medium
 
   * Team upload.
   * New upstream version
@@ -12,8 +12,9 @@ qiime (2020.11.0-1) UNRELEASED; urgency=medium
   * Added patches for compatibility with Python: (Closes: #950842)
     - python3.8.patch
     - python3.9.patch
+  * Added 32-bits.patch to fix autopkgtest regressions.
 
- -- Étienne Mollier <etienne.mollier at mailoo.org>  Sun, 29 Nov 2020 11:40:09 +0100
+ -- Étienne Mollier <etienne.mollier at mailoo.org>  Tue, 01 Dec 2020 19:02:16 +0100
 
 qiime (2019.10.0-1) unstable; urgency=medium
 


=====================================
debian/lintian-overrides
=====================================
@@ -0,0 +1,2 @@
+# These files are test data with national encoding on purpose.
+qiime binary: national-encoding */qiime2/metadata/tests/data/invalid/*


=====================================
debian/patches/32-bits.patch
=====================================
@@ -0,0 +1,28 @@
+Description: compatibility with 32-bits architectures
+Author: Étienne Mollier <etienne.mollier at mailoo.org>
+Forwarded: no
+Last-Update: 2020-12-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- qiime.orig/qiime2/metadata/metadata.py
++++ qiime/qiime2/metadata/metadata.py
+@@ -1162,7 +1162,7 @@
+ 
+     @classmethod
+     def _is_supported_dtype(cls, dtype):
+-        return dtype == 'float' or dtype == 'int'
++        return dtype == 'float' or dtype == 'int' or dtype == 'int64'
+ 
+     @classmethod
+     def _normalize_(cls, series):
+--- qiime.orig/qiime2/metadata/tests/test_metadata_column.py
++++ qiime/qiime2/metadata/tests/test_metadata_column.py
+@@ -26,7 +26,7 @@
+ 
+     @classmethod
+     def _is_supported_dtype(cls, dtype):
+-        return dtype == 'float' or dtype == 'int'
++        return dtype == 'float' or dtype == 'int' or dtype == 'int64'
+ 
+     @classmethod
+     def _normalize_(cls, series):


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 python3.8.patch
 python3.9.patch
+32-bits.patch



View it on GitLab: https://salsa.debian.org/med-team/qiime/-/compare/8f9ba770d1968dd5c6f055b056f422313df8b346...3b30e38c1fd484d5d03a2dfb72b5293aa9b0c912

-- 
View it on GitLab: https://salsa.debian.org/med-team/qiime/-/compare/8f9ba770d1968dd5c6f055b056f422313df8b346...3b30e38c1fd484d5d03a2dfb72b5293aa9b0c912
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201201/54b5c946/attachment-0001.html>