From 88feb144e19ed29b99010ff23300e7d420e4ea56 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 5 Dec 2023 16:53:00 -0700 Subject: [PATCH] Version 3.2.1 --- python-networkx.spec | 32 ++++++++++++-------------------- sources | 2 +- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/python-networkx.spec b/python-networkx.spec index c4e5e36..6d56459 100644 --- a/python-networkx.spec +++ b/python-networkx.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 # There is a bootstrap loop between libpysal and networkx when tests/docs are # enabled %bcond_with bootstrap @@ -11,8 +10,8 @@ %endif Name: python-networkx -Version: 3.1 -Release: 4%{?dist} +Version: 3.2.1 +Release: 1%{?dist} Summary: Creates and Manipulates Graphs and Networks License: BSD-3-Clause URL: https://networkx.org/ @@ -116,25 +115,17 @@ sed -e 's|\("https://docs\.python\.org/3/", \)None|\1"%{_docdir}/python3-docs/ht %endif # Permit older versions of doc packages where Fedora is behind -sed -e 's/\(sphinx>=\)6\.1/\15.3/' \ - -e 's/\(sphinx-gallery>=\)0\.12/\10.11/' \ - -e 's/\(numpydoc>=1.\)5/\14/' \ - -i requirements/doc.txt - -# Permit older versions of example packages where Fedora is behind -sed -e 's/\(seaborn>=0\.1\)2/\11/' \ - -e 's/\(cairocffi>=1\.\)4/\13/' \ - -i requirements/example.txt +# Also permit a newer version of nbconvert +sed -e 's/\(sphinx-gallery>=\)0\.14/\10.11.1/' \ + -e 's/\(numpydoc>=1.\)6/\14.0/' \ + -e 's/\(nbconvert<\)7\.9/\17.13/' \ + -i pyproject.toml requirements/doc.txt # Fedora does not have osmnx or momepy sed -i '/osmnx/d;/momepy/d' requirements/example.txt %generate_buildrequires -%if %{with doctest} -%pyproject_buildrequires -x doc,extra,test requirements/example.txt -%else -%pyproject_buildrequires -%endif +%pyproject_buildrequires %{?with_doctest:-x doc,extra,test requirements/example.txt} %build %pyproject_wheel @@ -148,8 +139,6 @@ rst2html --no-datestamp README.rst README.html %install %pyproject_install %pyproject_save_files networkx -mv %{buildroot}%{_docdir}/networkx-%{version} ./installed-docs -rm -f installed-docs/INSTALL.txt %if %{with doctest} # Repack uncompressed zip archives @@ -172,7 +161,7 @@ done %files -n python3-networkx -f %{pyproject_files} %if %{with doctest} -%doc README.html installed-docs/* +%doc README.html %endif %if %{with doctest} @@ -181,6 +170,9 @@ done %endif %changelog +* Tue Dec 5 2023 Jerry James - 3.2.1-1 +- Version 3.2.1 + * Fri Jul 21 2023 Fedora Release Engineering - 3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 7841b47..7a31393 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (networkx-3.1.tar.gz) = f393d572e4f3b2266c4a229ae17a5e0f71f874aa21c535f365b3d81c4ba8c0537e18c663f04a1d6886e8ab5663c702b25890cdbdcac0869fc375ede36d9cea70 +SHA512 (networkx-3.2.1.tar.gz) = 4e64352c5b2746ba5722d9ac877ca13981cf0d109df5403d8f314ed07bb6c12cd0065217a3b13daefb62f5fc74ad2bc28db2839b0d57bca8a975a9da218fadb7