Control: tags 999519 + patch
Control: tags 999519 + pending

Dear maintainer,

I've prepared an NMU for xrayutilities (versioned as 1.7.1-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Also filed as: 
https://salsa.debian.org/science-team/python-xrayutilities/-/merge_requests/1

Regards,

SR
diff -Nru xrayutilities-1.7.1/debian/changelog xrayutilities-1.7.1/debian/changelog
--- xrayutilities-1.7.1/debian/changelog	2021-09-19 08:54:46.000000000 -0400
+++ xrayutilities-1.7.1/debian/changelog	2021-11-22 21:22:36.000000000 -0400
@@ -1,3 +1,10 @@
+xrayutilities (1.7.1-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Patch: matplotlib 3.5 support (Closes: #999519)
+
+ -- Stefano Rivera <stefa...@debian.org>  Mon, 22 Nov 2021 21:22:36 -0400
+
 xrayutilities (1.7.1-2) unstable; urgency=medium
 
   * Corrected Profile nodocs -> nodoc
diff -Nru xrayutilities-1.7.1/debian/patches/0005-Fix-matplotlib-3.5-issue.patch xrayutilities-1.7.1/debian/patches/0005-Fix-matplotlib-3.5-issue.patch
--- xrayutilities-1.7.1/debian/patches/0005-Fix-matplotlib-3.5-issue.patch	1969-12-31 20:00:00.000000000 -0400
+++ xrayutilities-1.7.1/debian/patches/0005-Fix-matplotlib-3.5-issue.patch	2021-11-22 21:22:36.000000000 -0400
@@ -0,0 +1,35 @@
+From: Dominik Kriegner <dominik.krieg...@gmail.com>
+Date: Fri, 12 Nov 2021 12:30:16 +0100
+Subject: Fix matplotlib-3.5 issue.
+
+reported by Debian. The best solution seems to be to avoid the
+problematic keyword argument since we anyhow specified the default
+value.
+
+Bug-Debian: https://bugs.debian.org/999519
+---
+ lib/xrayutilities/simpack/fit.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/xrayutilities/simpack/fit.py b/lib/xrayutilities/simpack/fit.py
+index 8e71783..5d49dcf 100644
+--- a/lib/xrayutilities/simpack/fit.py
++++ b/lib/xrayutilities/simpack/fit.py
+@@ -13,7 +13,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+-# Copyright (C) 2016-2020 Dominik Kriegner <dominik.krieg...@gmail.com>
++# Copyright (C) 2016-2021 Dominik Kriegner <dominik.krieg...@gmail.com>
+ 
+ import warnings
+ 
+@@ -208,7 +208,7 @@ class FitModel(object):
+                 else:
+                     self.zord = 1
+                 if self.logscale:
+-                    self.ax.set_yscale("log", nonposy='clip')
++                    self.ax.set_yscale("log")
+                 self.fline = None
+ 
+             def showplot(self, xlab=self.lmodel.xlabelstr,
diff -Nru xrayutilities-1.7.1/debian/patches/series xrayutilities-1.7.1/debian/patches/series
--- xrayutilities-1.7.1/debian/patches/series	2021-09-19 08:54:46.000000000 -0400
+++ xrayutilities-1.7.1/debian/patches/series	2021-11-22 21:22:36.000000000 -0400
@@ -2,3 +2,4 @@
 0002-Desactivated-pdf-generation-for-the-doc.patch
 0003-Do-not-change-PYTHONPATH-during-the-build.patch
 0004-Used-the-system-Mathjax.patch
+0005-Fix-matplotlib-3.5-issue.patch

Reply via email to