[med-svn] [Git][med-team/nipy][master] 4 commits: numpy1.24.patch: add; fix remaining test failure.

[Étienne Mollier (@emollier)]

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


Commits:
7f7d4de3 by Étienne Mollier at 2023-01-14T14:38:47+01:00
numpy1.24.patch: add; fix remaining test failure.

Closes: #1027255, #1028778

- - - - -
f60e789e by Étienne Mollier at 2023-01-14T14:50:36+01:00
d/copyright: bump copyright year.

- - - - -
4d0f6051 by Étienne Mollier at 2023-01-14T14:52:51+01:00
d/*.lintian-overrides: remove; unused overrides.

- - - - -
641e5c6f by Étienne Mollier at 2023-01-14T14:54:04+01:00
ready to upload to unstable.

- - - - -


5 changed files:

- debian/changelog
- debian/copyright
- + debian/patches/numpy1.24.patch
- debian/patches/series
- − debian/python-nipy-doc.lintian-overrides


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-nipy (0.5.0-6) UNRELEASED; urgency=medium
+nipy (0.5.0-6) unstable; urgency=medium
 
   [ Étienne Mollier ]
   * d/control: add myself to uploaders.
@@ -7,7 +7,13 @@ nipy (0.5.0-6) UNRELEASED; urgency=medium
   [ Bas Couwenberg ]
   * Add gbp.conf to use pristine-tar & --source-only-changes by default.
 
- -- Étienne Mollier <emollier at debian.org>  Wed, 11 Jan 2023 23:06:56 +0100
+  [ Étienne Mollier ]
+  * numpy1.24.patch: add; fix remaining test failure.
+    (Closes: #1027255, #1028778)
+  * d/copyright: bump copyright year.
+  * d/*.lintian-overrides: remove; unused overrides.
+
+ -- Étienne Mollier <emollier at debian.org>  Sat, 14 Jan 2023 14:53:10 +0100
 
 nipy (0.5.0-5) unstable; urgency=medium
 


=====================================
debian/copyright
=====================================
@@ -24,6 +24,7 @@ License: BSD-3
 Files: debian/*
 Copyright: 2009-2012, Yaroslav Halchenko <debian at onerussian.com>
            2009-2010, Michael Hanke <michael.hanke at gmail.com>
+           2022-2023, Étienne Mollier <emollier at debian.org>
 License: BSD-3
 
 License: BSD-3


=====================================
debian/patches/numpy1.24.patch
=====================================
@@ -0,0 +1,23 @@
+Description: Fix formula summing for change in Numpy sum
+Author: Matthew Brett
+Bug-Debian: https://bugs.debian.org/1027255
+Applied-Upstream: https://github.com/nipy/nipy/commit/aaae2a377962f991ff300110f494889720c4ae21
+Reviewed-by: Étienne Mollier <emollier at debian.org>
+Last-Update: 2023-01-14
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- nipy.orig/nipy/algorithms/statistics/formula/formulae.py
++++ nipy/nipy/algorithms/statistics/formula/formulae.py
+@@ -569,9 +569,10 @@
+         for d in drop:
+             del(f[d])
+         if keep:
+-            return np.sum([t for n, t in f.items() if n in keep])
++            elements = [t for n, t in f.items() if n in keep]
+         else:
+-            return np.sum(list(f.values()))
++            elements = f.values()
++        return sum(elements, start=Formula([]))
+ 
+     def subs(self, old, new):
+         """ Perform a sympy substitution on all terms in the Formula


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 sphinx-ext
 local-mathjax.patch
 numpy-fix.patch
+numpy1.24.patch


=====================================
debian/python-nipy-doc.lintian-overrides deleted
=====================================
@@ -1,4 +0,0 @@
-# Explicit license file is desired for the completeness of the documentation
-#
-
-python-nipy-doc binary: extra-license-file usr/share/doc/python-nipy-doc/html/_sources/license.txt



View it on GitLab: https://salsa.debian.org/med-team/nipy/-/compare/3c0ae22b7fec2b1cace01e0f8fbc8f54a19eea88...641e5c6f7bb0232ddc3c5e68bbb249fd5ea5dc1b

-- 
View it on GitLab: https://salsa.debian.org/med-team/nipy/-/compare/3c0ae22b7fec2b1cace01e0f8fbc8f54a19eea88...641e5c6f7bb0232ddc3c5e68bbb249fd5ea5dc1b
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/20230114/d84253bd/attachment-0001.htm>