From 78039581c79b8414273c45dd89d4bb85f7cf8759 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 25 Aug 2021 10:25:55 -0600 Subject: [PATCH] Version 2.6.2. Drop upstreamed -pyyaml patch. --- python-networkx-doc.patch | 14 ++++---- python-networkx-pyyaml.patch | 9 ------ python-networkx.spec | 62 +++++++++++++++++++----------------- 3 files changed, 39 insertions(+), 46 deletions(-) delete mode 100644 python-networkx-pyyaml.patch diff --git a/python-networkx-doc.patch b/python-networkx-doc.patch index f02ba05..27fdb1d 100644 --- a/python-networkx-doc.patch +++ b/python-networkx-doc.patch @@ -1,10 +1,10 @@ ---- doc/conf.py.orig 2020-08-22 14:01:28.000000000 -0600 -+++ doc/conf.py 2020-08-22 20:32:12.490706081 -0600 -@@ -49,6 +49,7 @@ sphinx_gallery_conf = { - # path where to save gallery generated examples +--- doc/conf.py.orig 2021-07-08 10:53:35.000000000 -0600 ++++ doc/conf.py 2021-07-13 10:11:17.843998401 -0600 +@@ -50,6 +50,7 @@ sphinx_gallery_conf = { "gallery_dirs": "auto_examples", "backreferences_dir": "modules/generated", -+ 'expected_failing_examples': ['../examples/graph/plot_football.py'] + "image_scrapers": ("matplotlib",), ++ "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"] } - - # generate autosummary pages + # Add pygraphviz png scraper, if available + try: diff --git a/python-networkx-pyyaml.patch b/python-networkx-pyyaml.patch deleted file mode 100644 index c5fcb3b..0000000 --- a/python-networkx-pyyaml.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- networkx/readwrite/nx_yaml.py.orig 2020-08-22 14:01:28.000000000 -0600 -+++ networkx/readwrite/nx_yaml.py 2021-01-26 10:02:43.555537204 -0700 -@@ -88,5 +88,5 @@ def read_yaml(path): - except ImportError as e: - raise ImportError("read_yaml() requires PyYAML: http://pyyaml.org/") from e - -- G = yaml.load(path, Loader=yaml.FullLoader) -+ G = yaml.load(path, Loader=yaml.Loader) - return G diff --git a/python-networkx.spec b/python-networkx.spec index 5ee6f73..a05511b 100644 --- a/python-networkx.spec +++ b/python-networkx.spec @@ -1,45 +1,55 @@ %global srcname networkx Name: python-%{srcname} -Version: 2.5.1 -Release: 4%{?dist} +Version: 2.6.2 +Release: 1%{?dist} Summary: Creates and Manipulates Graphs and Networks License: BSD URL: http://networkx.github.io/ Source0: https://github.com/networkx/networkx/archive/%{srcname}-%{version}.tar.gz -# The football example requires network access, so expect it to fail. +# Some examples cannot be executed, so expect them to fail. +# Examples that require network access: +# - football +# - plot_delaunay (via contextily) +# - plot_points (via contextily) +# Examples that require packages not available from Fedora: +# - osmnx requires osmnx +# - plot_lines requires momepy Patch0: %{name}-doc.patch -# PyYAML 5.4+ breaks reading yaml files -# https://github.com/networkx/networkx/commit/a6dd458a12ad8db161271e2271644803d4f29a96 -Patch1: %{name}-pyyaml.patch BuildArch: noarch BuildRequires: make BuildRequires: python3-devel +BuildRequires: %{py3_dist matplotlib} +BuildRequires: %{py3_dist numpy} +BuildRequires: %{py3_dist pandas} +BuildRequires: %{py3_dist scipy} BuildRequires: %{py3_dist setuptools} %if 0%{?rhel} == 0 +BuildRequires: python-pygraphviz-doc BuildRequires: python3-docs BuildRequires: python3-numpy-doc -BuildRequires: %{py3_dist decorator} +BuildRequires: %{py3_dist cairocffi} +BuildRequires: %{py3_dist contextily} BuildRequires: %{py3_dist gdal} +BuildRequires: %{py3_dist geopandas} +BuildRequires: %{py3_dist libpysal} BuildRequires: %{py3_dist lxml} -BuildRequires: %{py3_dist matplotlib} BuildRequires: %{py3_dist nb2plots} -BuildRequires: %{py3_dist numpy} BuildRequires: %{py3_dist numpydoc} -BuildRequires: %{py3_dist pandas} BuildRequires: %{py3_dist pillow} +BuildRequires: %{py3_dist pydata-sphinx-theme} BuildRequires: %{py3_dist pydot} BuildRequires: %{py3_dist pygraphviz} BuildRequires: %{py3_dist pytest} BuildRequires: %{py3_dist pytest-cov} -BuildRequires: %{py3_dist pyyaml} -BuildRequires: %{py3_dist scipy} +BuildRequires: %{py3_dist python-igraph} +BuildRequires: %{py3_dist rtree} +BuildRequires: %{py3_dist seaborn} BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist sphinx-gallery} -BuildRequires: %{py3_dist sphinx-rtd-theme} BuildRequires: %{py3_dist texext} BuildRequires: xdg-utils @@ -56,15 +66,9 @@ study of the structure, dynamics, and functions of complex networks. Summary: Creates and Manipulates Graphs and Networks Recommends: %{py3_dist gdal} Recommends: %{py3_dist lxml} -Recommends: %{py3_dist matplotlib} -Recommends: %{py3_dist numpy} -Recommends: %{py3_dist pandas} Recommends: %{py3_dist pillow} Recommends: %{py3_dist pydot} Recommends: %{py3_dist pygraphviz} -Recommends: %{py3_dist pyparsing} -Recommends: %{py3_dist pyyaml} -Recommends: %{py3_dist scipy} Recommends: xdg-utils # This can be removed when Fedora 30 reaches EOL @@ -78,9 +82,7 @@ study of the structure, dynamics, and functions of complex networks. %if 0%{?rhel} == 0 %package doc Summary: Documentation for networkx -Requires: font(fontawesome) -Requires: font(lato) -Requires: font(robotoslab) +Requires: fontawesome5-fonts-all Provides: bundled(jquery) Provides: bundled(js-underscore) @@ -101,15 +103,11 @@ for f in $(grep -FRl %{_bindir}/env .); do done # Use local objects.inv for intersphinx -sed -e 's|\("https://docs\.python\.org/3/": \)None|\1"%{_docdir}/python3-docs/html/objects.inv"|' \ - -e 's|\("https://numpy\.org/doc/stable/": \)None|\1"%{_docdir}/python3-numpy-doc/objects.inv"|' \ +sed -e 's|\("https://docs\.python\.org/3/", \)None|\1"%{_docdir}/python3-docs/html/objects.inv"|' \ + -e 's|\("https://numpy\.org/doc/stable/", \)None|\1"%{_docdir}/python3-numpy-doc/objects.inv"|' \ + -e 's|\("https://pygraphviz.github.io/documentation/stable/", \)None|\1"%{_docdir}/python-pygraphviz/html/objects.inv"|' \ -i doc/conf.py -# Decorator >= 5.0.7 is okay to use. See: -# https://github.com/networkx/networkx/issues/4718 -# https://github.com/networkx/networkx/commit/01d9cfe028e82ce7f2f7fd378ffe6e43ba2fddbb -sed -i 's/decorator>=4\.3,<5/decorator>=5.0.7/' requirements/default.txt setup.py - %build %py3_build @@ -138,7 +136,7 @@ done %check %if 0%{?rhel} == 0 -pytest +%pytest %endif %files -n python3-networkx @@ -154,6 +152,10 @@ pytest %endif %changelog +* Wed Aug 25 2021 Jerry James - 2.6.2-1 +- Version 2.6.2 +- Drop upstreamed -pyyaml patch + * Fri Jul 23 2021 Fedora Release Engineering - 2.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild