Nilesh Patra pushed to branch master at Debian Med / nitime
Commits: 05ed94e2 by Nilesh Patra at 2023-08-25T01:55:10+05:30 Use deprecated networkx function for now, as the drop-in replacement upstream used is causing a regression. Fix suggested upstream already - - - - - ebe66ac7 by Nilesh Patra at 2023-08-24T20:40:32+00:00 Add patch to fix doc FTBFS with new matplotlib - - - - - 447bd385 by Nilesh Patra at 2023-08-24T20:40:32+00:00 Upload to unstable - - - - - 4 changed files: - debian/changelog - + debian/patches/matplotlib.patch - + debian/patches/revert-deprecation-fix.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,9 +1,4 @@ -nitime (0.10.1-1) UNRELEASED; urgency=medium - - WARNING: a test is failing, pending resolution of github issue[1]. - [1]: https://github.com/nipy/nitime/issues/207 - - * Team upload. +nitime (0.10.1-1) unstable; urgency=medium [ Andreas Tille ] * Drop debian/blends which is unused @@ -14,7 +9,13 @@ nitime (0.10.1-1) UNRELEASED; urgency=medium * fix-psd-test.patch: delete: fixed upstream. * numpy_1.24.patch: remove: applied upstream. - -- Étienne Mollier <[email protected]> Tue, 22 Aug 2023 09:58:31 +0200 + [ Nilesh Patra ] + * Use deprecated networkx function for now, as the drop-in replacement + upstream used is causing a regression. + Proper Fix suggested upstream already. + * Add patch to fix doc FTBFS with new matplotlib + + -- Nilesh Patra <[email protected]> Fri, 25 Aug 2023 01:55:48 +0530 nitime (0.9-5) unstable; urgency=medium ===================================== debian/patches/matplotlib.patch ===================================== @@ -0,0 +1,14 @@ +Description: Change make_axes_locatable's location with mpl's changed API +Author: Nilesh Patra <[email protected]> +Last-Update: 2023-08-24 +--- a/doc/conf.py ++++ b/doc/conf.py +@@ -23,7 +23,7 @@ + # is a string that should be a valid (possibly dotted) package name, and the + # second a list (possibly empty) of names to import from that package. + doc_deps = [['networkx', []], +- ['mpl_toolkits.axes_grid', ['make_axes_locatable']], ++ ['mpl_toolkits.axes_grid1.axes_divider', ['make_axes_locatable']], + ] + + # Analyze the dependencies, and fail if any is unmet, with a hopefully ===================================== debian/patches/revert-deprecation-fix.patch ===================================== @@ -0,0 +1,15 @@ +Description: The drop-in replacement is wrong, use the deprecated function for now. +Author: Nilesh Patra <[email protected]> +Forwarded: https://github.com/nipy/nitime/issues/207#issuecomment-1692354533 +Last-Update: 2023-08-25 +--- a/nitime/viz.py ++++ b/nitime/viz.py +@@ -680,7 +680,7 @@ + + # Build a 'weighted degree' array obtained by adding the (absolute value) + # of the weights for all edges pointing to each node: +- amat = nx.adjacency_matrix(G).todense() # get a normal array out of it ++ amat = nx.adj_matrix(G).A # get a normal array out of it + degarr = abs(amat).sum(0) # weights are sums across rows + + # Map the degree to the 0-1 range so we can use it for sizing the nodes. ===================================== debian/patches/series ===================================== @@ -2,3 +2,5 @@ deb_no_sources_for_docs python3 sphinx_ignore_github.patch numpydoc_1.24.patch +revert-deprecation-fix.patch +matplotlib.patch View it on GitLab: https://salsa.debian.org/med-team/nitime/-/compare/5f81053387a3fbba3d1952359eef147f1ec8d8d7...447bd3853b81ce89f40e58077f63e864d7f81074 -- View it on GitLab: https://salsa.debian.org/med-team/nitime/-/compare/5f81053387a3fbba3d1952359eef147f1ec8d8d7...447bd3853b81ce89f40e58077f63e864d7f81074 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
