[med-svn] [Git][med-team/emperor][master] 4 commits: Add upstream patch fpr pandas 1.5 compatibility

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / emperor


Commits:
eda81fd8 by Andreas Tille at 2023-01-26T07:36:35+01:00
Add upstream patch fpr pandas 1.5 compatibility

- - - - -
9127ac99 by Andreas Tille at 2023-01-26T07:53:21+01:00
Drop unused lintian-overrides

- - - - -
bdc230bb by Andreas Tille at 2023-01-26T07:54:20+01:00
Fix description

- - - - -
f6864cb5 by Andreas Tille at 2023-01-26T07:57:44+01:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/8b803cd81586b832550eaa2428fa2d0dd581d35f.patch
- debian/patches/series
- − debian/python3-emperor.lintian-overrides


Changes:

=====================================
debian/changelog
=====================================
@@ -1,12 +1,14 @@
-emperor (1.0.3+ds-7) UNRELEASED; urgency=medium
+emperor (1.0.3+ds-7) unstable; urgency=medium
 
   * Team upload.
   * Section: python
   * DEP3
-  TODO: Really fix #1024820 (Patch that ignores the test that makes build
-        file with pandas 1.5 is currently deactivated
+  * Add upstream patch fpr pandas 1.5 compatibility
+    Closes: #1024820
+  * Drop unused lintian-overrides
+  * Fix description
 
- -- Andreas Tille <tille at debian.org>  Fri, 13 Jan 2023 08:00:01 +0100
+ -- Andreas Tille <tille at debian.org>  Thu, 26 Jan 2023 07:54:27 +0100
 
 emperor (1.0.3+ds-6) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -60,7 +60,7 @@ Depends: ${sphinxdoc:Depends},
          libjs-bootstrap,
          libjs-jquery
 Multi-Arch: foreign
-Description: visualizing high-throughput microbial community data
+Description: visualizing high-throughput microbial community data (coc)
  Emperor is an interactive next generation tool for the analysis,
  visualization and understanding of high throughput microbial
  ecology datasets.
@@ -72,3 +72,5 @@ Description: visualizing high-throughput microbial community data
  with lightweight data files and hardware accelerated graphics,
  constitutes itself as the state of the art for analyzing N-dimensional
  data using principal coordinates analysis.
+ .
+ This package provides the documentation for python3-emperor.


=====================================
debian/patches/8b803cd81586b832550eaa2428fa2d0dd581d35f.patch
=====================================
@@ -0,0 +1,28 @@
+From 8b803cd81586b832550eaa2428fa2d0dd581d35f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Yoshiki=20V=C3=A1zquez=20Baeza?= <yoshiki at biomesense.com>
+Date: Fri, 13 Jan 2023 11:46:43 -0800
+Subject: [PATCH] BUG: Fixes issue with Pandas >=1.5
+
+Set objects are no longer allowed as an index argument for a DataFrame
+constructor.
+
+Fixes #810
+---
+ ChangeLog.md    | 3 ++-
+ emperor/core.py | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+--- a/emperor/core.py
++++ b/emperor/core.py
+@@ -308,9 +308,9 @@ class Emperor(object):
+                              'are using metadata and coordinates corresponding'
+                              ' to the same dataset.' % kind)
+ 
++        # sort the elements so we have a deterministic output
++        difference = sorted([str(i) for i in difference])
+         if difference and not ignore_missing_samples:
+-            # sort the elements so we have a deterministic output
+-            difference = sorted([str(i) for i in difference])
+ 
+             # if there's more than 5 missing elements, truncate the list
+             if len(difference) > 5:


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ do_not_use_custom_numpydoc.patch
 correct_jsdoc_arguments.patch
 EditSectionTitle.patch
 # ignore_one_failing_test.patch
+8b803cd81586b832550eaa2428fa2d0dd581d35f.patch


=====================================
debian/python3-emperor.lintian-overrides deleted
=====================================
@@ -1,3 +0,0 @@
-# This substitutes the jquery-ui.min.css shipping with the source tree
-python3-emperor: ldconfig-escape usr/lib/python3/dist-packages/emperor/support_files/vendor/css/jquery-ui.min.css -> usr/share/javascript/jquery-ui/themes/base/jquery-ui.min.css
-



View it on GitLab: https://salsa.debian.org/med-team/emperor/-/compare/3c91d32ed4f984fa33252cd7e4900a405ff277bb...f6864cb5a9d96b8863af1083efe19ab4d14f45f1

-- 
View it on GitLab: https://salsa.debian.org/med-team/emperor/-/compare/3c91d32ed4f984fa33252cd7e4900a405ff277bb...f6864cb5a9d96b8863af1083efe19ab4d14f45f1
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/20230126/8a7d784c/attachment-0001.htm>