Compare commits

...

No commits in common. 'c9' and 'c8' have entirely different histories.
c9 ... c8

2
.gitignore vendored

@ -1 +1 @@
SOURCES/networkx-2.6.2.tar.gz
SOURCES/networkx-1.11.tar.gz

@ -1 +1 @@
a898553fcc821ffe6d98f471d45f8654025bbf5c SOURCES/networkx-2.6.2.tar.gz
714ae728f5a85bf914547b7e69f9e6a5affedcd9 SOURCES/networkx-1.11.tar.gz

@ -0,0 +1,29 @@
make importing of drawing and geo subpackages optional
diff -Naur networkx-networkx-1.10.orig/networkx/__init__.py networkx-networkx-1.10/networkx/__init__.py
--- networkx-networkx-1.10.orig/networkx/__init__.py 2015-10-30 15:41:35.000000000 -0600
+++ networkx-networkx-1.10/networkx/__init__.py 2015-11-24 09:34:20.741823392 -0700
@@ -95,5 +95,8 @@
from networkx.linalg import *
from networkx.tests.test import run as test
-import networkx.drawing
-from networkx.drawing import *
+try:
+ import networkx.drawing
+ from networkx.drawing import *
+except ImportError:
+ pass
diff -Naur networkx-networkx-1.10.orig/networkx/readwrite/__init__.py networkx-networkx-1.10/networkx/readwrite/__init__.py
--- networkx-networkx-1.10.orig/networkx/readwrite/__init__.py 2015-10-30 15:41:35.000000000 -0600
+++ networkx-networkx-1.10/networkx/readwrite/__init__.py 2015-11-24 09:34:46.539738141 -0700
@@ -14,4 +14,8 @@
from networkx.readwrite.gml import *
from networkx.readwrite.graphml import *
from networkx.readwrite.gexf import *
-from networkx.readwrite.nx_shp import *
+
+try:
+ from networkx.readwrite.nx_shp import *
+except ImportError:
+ pass

@ -0,0 +1,11 @@
diff -up networkx-networkx-1.11/doc/source/conf.py.sphinx networkx-networkx-1.11/doc/source/conf.py
--- networkx-networkx-1.11/doc/source/conf.py.sphinx 2016-01-30 10:25:44.000000000 -0700
+++ networkx-networkx-1.11/doc/source/conf.py 2016-12-23 09:54:55.280925006 -0700
@@ -74,7 +74,6 @@ extensions = [
'sphinx.ext.intersphinx',
'sphinx.ext.mathjax',
'sphinx.ext.napoleon',
- 'sphinx.ext.pngmath',
'sphinx.ext.todo',
'sphinx.ext.viewcode',
#'sphinxcontrib.bibtex',

@ -1,239 +1,349 @@
%if 0%{?fedora} || 0%{?rhel} > 7
# Enable python3 build by default
%bcond_without python3
%else
%bcond_with python3
%endif
%if 0%{?rhel} > 7
# Disable python2 build by default
%bcond_with python2
%bcond_with docs
%else
%bcond_without python2
%bcond_without docs
%endif
%if 0%{?fedora} || 0%{?rhel} > 7
%global with_gdal 0
%endif
%global srcname networkx
Name: python-%{srcname}
Version: 2.6.2
Release: 2%{?dist}
Version: 1.11
Release: 16.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
Patch0: %{srcname}-optional-modules.patch
# Fix sphinx build error
# https://github.com/networkx/networkx/issues/2340
Patch3: python-networkx-sphinx.patch
BuildArch: noarch
BuildRequires: make
BuildRequires: python3-devel
BuildRequires: %{py3_dist setuptools}
%if 0%{?rhel} == 0
BuildRequires: python3-docs
BuildRequires: %{py3_dist gdal}
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 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 sphinx}
BuildRequires: %{py3_dist sphinx-gallery}
BuildRequires: %{py3_dist sphinx-rtd-theme}
BuildRequires: %{py3_dist texext}
BuildRequires: xdg-utils
# Documentation
BuildRequires: tex(latex)
BuildRequires: tex-preview
%endif
%description
NetworkX is a Python package for the creation, manipulation, and
study of the structure, dynamics, and functions of complex networks.
%if %{with python2}
%package -n python2-%{srcname}
Summary: Creates and Manipulates Graphs and Networks
Requires: python2-%{srcname}-core = %{version}-%{release}
%if 0%{?with_gdal}
Requires: python2-%{srcname}-geo = %{version}-%{release}
Requires: python2-%{srcname}-drawing = %{version}-%{release}
%endif # with gdal
%{?python_provide:%python_provide python2-%{srcname}}
%description -n python2-%{srcname}
NetworkX is a Python 2 package for the creation, manipulation, and
study of the structure, dynamics, and functions of complex networks.
%package -n python2-%{srcname}-core
Summary: Creates and Manipulates Graphs and Networks
BuildRequires: python2-devel
BuildRequires: python2-decorator
BuildRequires: python2-scipy
BuildRequires: python2-setuptools
BuildRequires: python2-yaml
BuildRequires: python2-pyparsing
BuildRequires: python2-nose
Requires: python2-decorator
Requires: python2-scipy
Requires: python2-yaml
Requires: python2-pyparsing
%{?python_provide:%python_provide python2-%{srcname}-core}
%description -n python2-%{srcname}-core
NetworkX is a Python 2 package for the creation, manipulation, and
study of the structure, dynamics, and functions of complex networks.
%if 0%{?with_gdal}
%package -n python2-%{srcname}-geo
Summary: GDAL I/O
Requires: python2-%{srcname}-core = %{version}-%{release}
BuildRequires: python2-gdal
Requires: python2-gdal
%{?python_provide:%python_provide python2-%{srcname}-geo}
%description -n python2-%{srcname}-geo
NetworkX is a Python 3 package for the creation, manipulation, and
study of the structure, dynamics, and functions of complex networks.
This package provides GDAL I/O support.
%package -n python2-%{srcname}-drawing
Summary: visual representations for graphs and networks
Requires: python2-%{srcname}-core = %{version}-%{release}
BuildRequires: python2-graphviz
BuildRequires: python2-matplotlib
BuildRequires: python2-pydotplus
Requires: python2-graphviz
Requires: python2-matplotlib
Requires: python2-pydotplus
%{?python_provide:%python_provide python2-%{srcname}-drawing}
%description -n python2-%{srcname}-drawing
NetworkX is a Python 2 package for the creation, manipulation, and
study of the structure, dynamics, and functions of complex networks.
This package provides support for graph visualizations.
%endif # with gdal
%endif # with python2
%if %{with python3}
%package -n python3-%{srcname}
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
Obsoletes: python3-%{srcname}-test < 2.3-2
Provides: python3-%{srcname}-test = %{version}-%{release}
Requires: python3-%{srcname}-core = %{version}-%{release}
%if 0%{?with_gdal}
Requires: python3-%{srcname}-geo = %{version}-%{release}
Requires: python3-%{srcname}-drawing = %{version}-%{release}
%endif
%{?python_provide:%python_provide python3-%{srcname}}
%description -n python3-%{srcname}
NetworkX is a Python 3 package for the creation, manipulation, and
study of the structure, dynamics, and functions of complex networks.
%if 0%{?rhel} == 0
%package -n python3-%{srcname}-core
Summary: Creates and Manipulates Graphs and Networks
BuildRequires: python3-devel
BuildRequires: python3-setuptools
Requires: python3-decorator
Requires: python3-yaml
Requires: python3-scipy
Requires: python3-pyparsing
%{?python_provide:%python_provide python3-%{srcname}-core}
%description -n python3-%{srcname}-core
NetworkX is a Python 3 package for the creation, manipulation, and
study of the structure, dynamics, and functions of complex networks.
%if 0%{?with_gdal}
%package -n python3-%{srcname}-geo
Summary: GDAL I/O
Requires: python3-%{srcname}-core = %{version}-%{release}
BuildRequires: gdal-python3
Requires: gdal-python3
%{?python_provide:%python_provide python3-%{srcname}-geo}
%description -n python3-%{srcname}-geo
NetworkX is a Python 3 package for the creation, manipulation, and
study of the structure, dynamics, and functions of complex networks.
This package provides GDAL I/O support.
%package -n python3-%{srcname}-drawing
Summary: visual representations for graphs and networks
Requires: python3-%{srcname}-core = %{version}-%{release}
BuildRequires: python3-matplotlib
BuildRequires: python3-pydotplus
Requires: python3-matplotlib
Requires: python3-pydotplus
%{?python_provide:%python_provide python3-%{srcname}-drawing}
%description -n python3-%{srcname}-drawing
NetworkX is a Python 3 package for the creation, manipulation, and
study of the structure, dynamics, and functions of complex networks.
This package provides support for graph visualizations.
%endif
%endif # with python3
%if %{with docs}
%package doc
Summary: Documentation for networkx
Requires: font(fontawesome)
Requires: font(lato)
Requires: font(robotoslab)
BuildRequires: python2-pydotplus
BuildRequires: python2-sphinx
BuildRequires: python2-sphinx_rtd_theme
BuildRequires: tex(latex)
BuildRequires: tex-preview
BuildRequires: python2-matplotlib
Provides: bundled(jquery)
Provides: bundled(js-underscore)
%description doc
Documentation for networkx
%endif
%endif # with docs
%prep
%autosetup -p0 -n %{srcname}-%{srcname}-%{version}
# Do not use env
for f in $(grep -FRl %{_bindir}/env .); do
sed -e 's,%{_bindir}/env python[[:digit:]]*,%{python3},' \
-e 's,%{_bindir}/env ,%{_bindir},' \
-i.orig $f
touch -r $f.orig $f
rm $f.orig
done
%setup -q -n %{srcname}-%{srcname}-%{version}
%patch0 -p1
%patch3 -p1 -b .sphinx
# 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"|' \
-i doc/conf.py
# Fix permissions
find examples -type f -perm /0111 -exec chmod a-x {} +
%build
%if %{with python2}
%py2_build
%endif # with python2
# Documentation build
# Conditionalize it since it requires python2 for now
%if %{with docs}
PYTHONPATH=$PWD/build/lib make SPHINXBUILD=sphinx-build -C doc html
%endif # with docs
%if %{with python3}
# Setup for python3
%if %{with python2}
mv build build2
mv networkx/*.pyc build2
%endif # with python2
# Build for python3
%py3_build
%if 0%{?rhel} == 0
# Build the documentation
PYTHONPATH=$PWD/build/lib make -C doc html
rst2html --no-datestamp README.rst README.html
%endif
%endif # with python3
%install
%if %{with python3}
# Install the python3 version
%py3_install
mv %{buildroot}%{_docdir}/networkx-%{version} ./installed-docs
%endif # with python3
%if %{with python2}
# Setup for python2
mv build build3
mv build2 build
mv -f build/*.pyc networkx
# Install the python2 version
%py2_install
# Fix permissions and binary paths
for f in `grep -FRl /usr/bin/env $RPM_BUILD_ROOT%{python2_sitelib}`; do
sed 's|/usr/bin/env python|%{_bindir}/python2|' $f > $f.new
touch -r $f $f.new
chmod a+x $f.new
mv -f $f.new $f
done
%endif # with python2
%if %{with python3}
for f in `grep -FRl /usr/bin/env $RPM_BUILD_ROOT%{python3_sitelib}`; do
sed 's|/usr/bin/env python|%{__python3}|' $f > $f.new
touch -r $f $f.new
chmod a+x $f.new
mv -f $f.new $f
done
%endif # with python3
#if %{with docs}
mv $RPM_BUILD_ROOT%{_docdir}/networkx-%{version} ./installed-docs
rm -f installed-docs/INSTALL.txt
#endif # with docs
%if 0%{?rhel} == 0
# Repack uncompressed zip archives
for fil in $(find doc/build -name \*.zip); do
mkdir zip
cd zip
unzip ../$fil
zip -9r ../$fil .
cd ..
rm -fr zip
done
%endif
%clean
rm -fr %{buildroot}
rm -f /tmp/tmp??????
%check
%if 0%{?rhel} == 0
pytest
%endif
%files -n python3-networkx
%if 0%{?rhel} == 0
%doc README.html installed-docs/*
%endif
%if %{with python2}
mkdir site-packages
mv networkx site-packages
PYTHONPATH=$PWD/site-packages %{__python2} -c "import networkx; networkx.test()"
%endif # with python2
%if %{with python2}
%files -n python2-%{srcname}
%doc README.rst
%license LICENSE.txt
%{python3_sitelib}/networkx*
%if 0%{?rhel} == 0
%files doc
%doc doc/build/html/*
%endif
%changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.6.2-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Wed Aug 4 2021 Petr Lautrbach <plautrba@redhat.com> - 2.6.2-1
- Version 2.6.2
%files -n python2-%{srcname}-core
%doc installed-docs/*
%{python2_sitelib}/*
%exclude %{python2_sitelib}/networkx/drawing/
%if 0%{?with_gdal}
%exclude %{python2_sitelib}/networkx/readwrite/nx_shp.py*
%endif # with gdal
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.5-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
%if 0%{?with_gdal}
%files -n python2-%{srcname}-drawing
%{python2_sitelib}/networkx/drawing
* Tue Jan 26 2021 Jerry James <loganjerry@gmail.com> - 2.5-3
- Add -pyyaml patch to fix FTBFS
%files -n python2-%{srcname}-geo
%{python2_sitelib}/networkx/readwrite/nx_shp.py*
%endif # with gdal
%endif # with python2
* Fri Dec 11 2020 Petr Lautrbach <plautrba@redhat.com> - 2.5-2
- Limit BuildRequires to necessary minimum in Red Hat Enterprise Linux
- Skip pytest in Red Hat Enterprise Linux
- Do not build -doc subpackage for Red Hat Enterprise Linux
* Sat Aug 22 2020 Jerry James <loganjerry@gmail.com> - 2.5-1
- Version 2.5
- All patches except -doc have been upstreamed; drop them
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-6
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2.4-4
- Rebuilt for Python 3.9
%if %{with python3}
%files -n python3-networkx
%doc README.rst
%license LICENSE.txt
* Mon Mar 9 2020 Jerry James <loganjerry@gmail.com> - 2.4-3
- Add -deprecated and -arg-order patches to fix FTBFS with python 3.9
%files -n python3-networkx-core
%doc installed-docs/*
%{python3_sitelib}/*
%exclude %{python3_sitelib}/networkx/drawing/
%if 0%{?with_gdal}
%exclude %{python3_sitelib}/networkx/readwrite/nx_shp.py
%exclude %{python3_sitelib}/networkx/readwrite/__pycache__/nx_shp.*
%endif # with gdal
%if 0%{?with_gdal}
%files -n python3-networkx-drawing
%{python3_sitelib}/networkx/drawing
%files -n python3-networkx-geo
%{python3_sitelib}/networkx/readwrite/nx_shp.py
%{python3_sitelib}/networkx/readwrite/__pycache__/nx_shp.*
%endif # with gdal
%endif # with python3
%if %{with docs}
%files doc
%doc doc/build/html/*
%endif # with docs
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Nov 4 2019 Jerry James <loganjerry@gmail.com> - 2.4-1
- New upstream version
- Drop upstreamed patches: -is, -source-target, -union-find, -cb-iterable,
-iterable, and -dict-iteration
- Unbundle fonts from the documentation
- Reenable the tests
- Add -test patch
%changelog
* Tue Oct 22 2019 Petr Lautrbach <plautrba@redhat.com> - 1.11-16.1
- Build dependencies cleanup
* Wed Sep 11 2019 Jerry James <loganjerry@gmail.com> - 2.3-5
- Add -doc patch to fix building the gallery of examples
- Add -is patch to reduce noise in sagemath
- Add upstream bug fix patches: -source-target, -union-find, -cb-iterable,
-iterable, and -dict-iteration
* Thu Jan 17 2019 Lon Hohberger <lon@redhat.com> - 1.11-15
- Fix gdal requires block
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.3-4
- Rebuilt for Python 3.8
* Wed Jun 13 2018 Petr Viktorin <pviktori@redhat.com> - 1.11-14
- Don't build the geo subpackage
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jun 07 2018 Tomas Orsava <torsava@redhat.com> - 1.11-13
- Switch hardcoded python3 shebangs into the %%{__python3} macro
* Thu May 16 2019 Jerry James <loganjerry@gmail.com> - 2.3-2
- Merge the -test subpackage back into the main package (bz 1708372)
* Tue Apr 17 2018 Lumír Balhar <lbalhar@redhat.com> - 1.11-12
- Build dependencies cleanup
* Sat Apr 27 2019 Jerry James <loganjerry@gmail.com> - 2.3-1
- New upstream version
- Drop upstreamed -abc patch
- Add a -test subpackage (bz 1668197)
- Convert most Requires to Recommends (bz 1668197)
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Oct 30 2018 Jerry James <loganjerry@gmail.com> - 2.2-2
- Add -abc patch to quiet warnings
* Sat Oct 13 2018 Jerry James <loganjerry@gmail.com> - 2.2-1
- New upstream version (bz 1600361)
- Drop all patches
- Drop the python2 subpackages (bz 1634570)
- Figure out the BuildRequires all over again (bz 1576805)
- Consolidate BuildRequires so I can tell what is actually on the list
- Drop conditionals for RHEL < 8; this version can never appear there anyway
- Consolidate back to a single package for the same reason
- Temporarily disable tests due to multigraph bug in graphviz > 2.38
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.11-12
- Rebuilt for Python 3.7
* Fri May 18 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.11-11
- Update graphviz dependency for python2
- Drop graphviz dependency for python3 (graphviz doesn't support python3)
* Wed Apr 11 2018 Charalampos Stratakis <cstratak@redhat.com> - 1.11-11
- Conditionalize the Python 2 subpackage and don't build it on EL > 7
* Fri Mar 09 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.11-10
- Update Python 2 dependency declarations to new packaging standards

Loading…
Cancel
Save