Version 3.1

Also:
- Drop obsolete test patch
- Dynamically generate python dependencies

python-networkx-doc.patch

@@ -1,9 +1,9 @@
---- doc/conf.py.orig	2021-07-08 10:53:35.000000000 -0600
+--- doc/conf.py.orig	2023-04-04 13:40:23.000000000 -0600
-+++ doc/conf.py	2021-07-13 10:11:17.843998401 -0600
++++ doc/conf.py	2023-04-07 16:30:21.987007962 -0600
-@@ -50,6 +50,7 @@ sphinx_gallery_conf = {
+@@ -51,6 +51,7 @@ sphinx_gallery_conf = {
-     "gallery_dirs": "auto_examples",
      "backreferences_dir": "modules/generated",
      "image_scrapers": ("matplotlib",),
+     "plot_gallery": "True",
 +    "expected_failing_examples": ["../examples/geospatial/plot_delaunay.py", "../examples/geospatial/plot_lines.py", "../examples/geospatial/plot_osmnx.py", "../examples/geospatial/plot_points.py", "../examples/graph/plot_football.py"]
  }
  # Add pygraphviz png scraper, if available

python-networkx-test.patch

@@ -1,11 +0,0 @@
---- networkx/algorithms/approximation/tests/test_traveling_salesman.py.orig	2022-07-18 15:19:22.000000000 -0600
-+++ networkx/algorithms/approximation/tests/test_traveling_salesman.py	2022-08-02 16:08:46.067509115 -0600
-@@ -758,7 +758,7 @@ def test_asadpour_tsp():
-     #
-     # However, we are using a fixed random number generator so we know what the
-     # expected tour is.
--    expected_tours = [[1, 4, 5, 0, 2, 3, 2, 1], [3, 2, 0, 1, 4, 5, 3]]
-+    expected_tours = [[1, 4, 5, 0, 2, 3, 2, 1], [3, 2, 0, 1, 4, 5, 3], [3, 2, 1, 0, 5, 4, 3]]
- 
-     assert tour in expected_tours
- 

python-networkx.spec

@@ -10,8 +10,8 @@
 %endif
 
 Name:           python-networkx
-Version:        2.8.8
+Version:        3.1
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Creates and Manipulates Graphs and Networks
 License:        BSD-3-Clause
 URL:            https://networkx.org/
@@ -25,51 +25,22 @@ Source0:        https://github.com/networkx/networkx/archive/networkx-%{version}
 # - osmnx requires osmnx
 # - plot_lines requires momepy
 Patch0:         %{name}-doc.patch
-# Temporary workaround for a failing test.
-# See https://github.com/networkx/networkx/issues/5913
-Patch1:         %{name}-test.patch
 
 BuildArch:      noarch
 
 BuildRequires:  make
 BuildRequires:  python3-devel
-BuildRequires:  pyproject-rpm-macros
+
-BuildRequires:  %{py3_dist setuptools}
-BuildRequires:  %{py3_dist pip}
-BuildRequires:  %{py3_dist wheel}
 %if %{with doctest}
-BuildRequires:  %{py3_dist matplotlib}
-BuildRequires:  %{py3_dist numpy}
-BuildRequires:  %{py3_dist pandas}
-BuildRequires:  %{py3_dist scipy}
-
-# Extras
-BuildRequires:  %{py3_dist lxml}
-BuildRequires:  %{py3_dist pygraphviz}
-BuildRequires:  %{py3_dist pydot}
-BuildRequires:  %{py3_dist sympy}
-
 # Tests
-BuildRequires:  %{py3_dist pytest}
 BuildRequires:  %{py3_dist pytest-mpl}
 
 # Documentation
 BuildRequires:  python-pygraphviz-doc
 BuildRequires:  python3-docs
 BuildRequires:  python3-numpy-doc
-BuildRequires:  %{py3_dist cairocffi}
-BuildRequires:  %{py3_dist contextily}
 BuildRequires:  %{py3_dist geopandas}
-BuildRequires:  %{py3_dist igraph}
 BuildRequires:  %{py3_dist libpysal}
-BuildRequires:  %{py3_dist nb2plots}
-BuildRequires:  %{py3_dist numpydoc}
-BuildRequires:  %{py3_dist pillow}
-BuildRequires:  %{py3_dist pydata-sphinx-theme}
-BuildRequires:  %{py3_dist seaborn}
-BuildRequires:  %{py3_dist sphinx}
-BuildRequires:  %{py3_dist sphinx-gallery}
-BuildRequires:  %{py3_dist texext}
 BuildRequires:  sympy-doc
 BuildRequires:  tex(latex)
 BuildRequires:  tex-preview
@@ -121,7 +92,7 @@ study of the structure, dynamics, and functions of complex networks.
 # searchindex.js: BSD-2-Clause
 License:        BSD-3-Clause AND BSD-2-Clause AND MIT
 Summary:        Documentation for networkx
-Requires:       fontawesome5-fonts-all
+Requires:       fontawesome-fonts-all
 Provides:       bundled(js-jquery)
 Provides:       bundled(js-underscore)
 
@@ -143,11 +114,26 @@ sed -e 's|\("https://docs\.python\.org/3/", \)None|\1"%{_docdir}/python3-docs/ht
     -i doc/conf.py
 %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
+
 # Fedora does not have osmnx or momepy
 sed -i '/osmnx/d;/momepy/d' requirements/example.txt
 
-# Allow use of numpydoc 1.4 until Fedora catches up
+%generate_buildrequires
-sed -i 's/\(numpydoc>=1.\)5/\14/' requirements/doc.txt
+%if %{with doctest}
+%pyproject_buildrequires -x doc,extra,test requirements/example.txt
+%else
+%pyproject_buildrequires
+%endif
 
 %build
 %pyproject_wheel
@@ -194,6 +180,11 @@ done
 %endif
 
 %changelog
+* Fri Apr  7 2023 Jerry James <loganjerry@gmail.com> - 3.1-1
+- Version 3.1
+- Drop obsolete test patch
+- Dynamically generate python dependencies
+
 * Thu Mar 30 2023 Jerry James <loganjerry@gmail.com> - 2.8.8-3
 - Add "extra" extras subpackage
 - Simplify conditionals

sources

@@ -1 +1 @@
-SHA512 (networkx-2.8.8.tar.gz) = ea38b34184e69254fd245281ce09b88059f786cadca6250ea0507c286346e609fcc2fac2849de09b4419a91a7200e4e9940f23b65dd460380af1fc1cf75304fe
+SHA512 (networkx-3.1.tar.gz) = f393d572e4f3b2266c4a229ae17a5e0f71f874aa21c535f365b3d81c4ba8c0537e18c663f04a1d6886e8ab5663c702b25890cdbdcac0869fc375ede36d9cea70