Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
||||
1
|
||||
5
.gitignore
vendored
5
.gitignore
vendored
@ -1 +1,4 @@
|
||||
SOURCES/networkx-1.11.tar.gz
|
||||
/networkx_reference.pdf
|
||||
/networkx_tutorial.pdf
|
||||
/networkx-documentation.zip
|
||||
/networkx-*.tar.gz
|
||||
|
||||
@ -1 +0,0 @@
|
||||
714ae728f5a85bf914547b7e69f9e6a5affedcd9 SOURCES/networkx-1.11.tar.gz
|
||||
5
README.md
Normal file
5
README.md
Normal file
@ -0,0 +1,5 @@
|
||||
# python-networkx
|
||||
|
||||
[NetworkX](https://networkx.org/) is a Python package for the creation,
|
||||
manipulation, and study of the structure, dynamics, and functions of complex
|
||||
networks.
|
||||
@ -1,29 +0,0 @@
|
||||
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
|
||||
@ -1,11 +0,0 @@
|
||||
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,490 +0,0 @@
|
||||
%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: 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
|
||||
|
||||
%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
|
||||
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.
|
||||
|
||||
%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
|
||||
|
||||
BuildRequires: python2-pydotplus
|
||||
BuildRequires: python2-sphinx
|
||||
BuildRequires: python2-sphinx_rtd_theme
|
||||
BuildRequires: tex(latex)
|
||||
BuildRequires: tex-preview
|
||||
BuildRequires: python2-matplotlib
|
||||
Provides: bundled(jquery)
|
||||
|
||||
|
||||
%description doc
|
||||
Documentation for networkx
|
||||
%endif # with docs
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{srcname}-%{srcname}-%{version}
|
||||
%patch0 -p1
|
||||
%patch3 -p1 -b .sphinx
|
||||
|
||||
# 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
|
||||
%endif # with python3
|
||||
|
||||
%install
|
||||
%if %{with python3}
|
||||
# Install the python3 version
|
||||
%py3_install
|
||||
%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
|
||||
|
||||
%clean
|
||||
rm -fr %{buildroot}
|
||||
rm -f /tmp/tmp??????
|
||||
|
||||
%check
|
||||
%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
|
||||
|
||||
%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
|
||||
|
||||
%if 0%{?with_gdal}
|
||||
%files -n python2-%{srcname}-drawing
|
||||
%{python2_sitelib}/networkx/drawing
|
||||
|
||||
%files -n python2-%{srcname}-geo
|
||||
%{python2_sitelib}/networkx/readwrite/nx_shp.py*
|
||||
%endif # with gdal
|
||||
%endif # with python2
|
||||
|
||||
%if %{with python3}
|
||||
%files -n python3-networkx
|
||||
%doc README.rst
|
||||
%license LICENSE.txt
|
||||
|
||||
%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
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Oct 22 2019 Petr Lautrbach <plautrba@redhat.com> - 1.11-16.1
|
||||
- Build dependencies cleanup
|
||||
|
||||
* Thu Jan 17 2019 Lon Hohberger <lon@redhat.com> - 1.11-15
|
||||
- Fix gdal requires block
|
||||
|
||||
* Wed Jun 13 2018 Petr Viktorin <pviktori@redhat.com> - 1.11-14
|
||||
- Don't build the geo subpackage
|
||||
|
||||
* Thu Jun 07 2018 Tomas Orsava <torsava@redhat.com> - 1.11-13
|
||||
- Switch hardcoded python3 shebangs into the %%{__python3} macro
|
||||
|
||||
* Tue Apr 17 2018 Lumír Balhar <lbalhar@redhat.com> - 1.11-12
|
||||
- Build dependencies cleanup
|
||||
|
||||
* 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
|
||||
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Dec 07 2017 Merlin Mathesius <mmathesi@redhat.com> - 1.11-8
|
||||
- Cleanup spec file conditionals
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Dec 23 2016 Orion Poplawski <orion@cora.nwra.com> - 1.11-5
|
||||
- Add patch to fix sphinx build
|
||||
|
||||
* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 1.11-5
|
||||
- Rebuild for Python 3.6
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-4
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
* Thu Apr 14 2016 Jerry James <loganjerry@gmail.com> - 1.11-3
|
||||
- Change pydot dependencies to pydotplus (bz 1326957)
|
||||
|
||||
* Sat Apr 2 2016 Jerry James <loganjerry@gmail.com> - 1.11-2
|
||||
- Fix gdal and pydot dependencies
|
||||
|
||||
* Sat Mar 5 2016 Jerry James <loganjerry@gmail.com> - 1.11-1
|
||||
- New upstream version
|
||||
- Drop upstreamed -numpy patch
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Mon Feb 1 2016 Jerry James <loganjerry@gmail.com> - 1.10-1
|
||||
- Comply with latest python packaging guidelines (bz 1301767)
|
||||
|
||||
* Tue Dec 1 2015 Jerry James <loganjerry@gmail.com> - 1.10-1
|
||||
- New upstream version
|
||||
- Update URLs
|
||||
- Add -numpy patch to fix test failure
|
||||
|
||||
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
|
||||
|
||||
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat Feb 21 2015 Jerry James <loganjerry@gmail.com> - 1.9.1-3
|
||||
- Note bundled jquery
|
||||
|
||||
* Tue Oct 7 2014 Jerry James <loganjerry@gmail.com> - 1.9.1-2
|
||||
- Fix python3-networkx-drawing subpackage (bz 1149980)
|
||||
- Fix python(3)-geo subpackage
|
||||
|
||||
* Mon Sep 22 2014 Jerry James <loganjerry@gmail.com> - 1.9.1-1
|
||||
- New upstream version
|
||||
- Fix license handling
|
||||
|
||||
* Thu Jul 10 2014 Jerry James <loganjerry@gmail.com> - 1.9-2
|
||||
- BR python-setuptools
|
||||
|
||||
* Tue Jul 8 2014 Jerry James <loganjerry@gmail.com> - 1.9-1
|
||||
- New upstream version
|
||||
- Drop upstreamed -test-rounding-fix patch
|
||||
- Upstream no longer bundles python-decorator; drop the workaround
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed May 14 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1.8.1-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
|
||||
|
||||
* Thu Mar 13 2014 Pádraig Brady <pbrady@redhat.com> - 1.8.1-12
|
||||
- Split to subpackages and support EL6 and EL7
|
||||
|
||||
* Thu Oct 3 2013 Jerry James <loganjerry@gmail.com> - 1.8.1-2
|
||||
- Update project and source URLs
|
||||
|
||||
* Fri Aug 9 2013 Jerry James <loganjerry@gmail.com> - 1.8.1-1
|
||||
- New upstream version
|
||||
|
||||
* Mon Jul 29 2013 Jerry James <loganjerry@gmail.com> - 1.8-1
|
||||
- New upstream version
|
||||
- Add tex-preview BR for documentation
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Mon Aug 6 2012 Jerry James <loganjerry@gmail.com> - 1.7-1
|
||||
- New upstream version
|
||||
|
||||
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Tue Jan 10 2012 Jerry James <loganjerry@gmail.com> - 1.6-2
|
||||
- Mass rebuild for Fedora 17
|
||||
|
||||
* Mon Nov 28 2011 Jerry James <loganjerry@gmail.com> - 1.6-1
|
||||
- New upstream version
|
||||
- Do not use bundled python-decorator
|
||||
- Remove Requires: ipython, needed by one example only
|
||||
- Clean junk files left in /tmp
|
||||
|
||||
* Wed Jun 22 2011 Jerry James <loganjerry@gmail.com> - 1.5-1
|
||||
- New upstream version
|
||||
- Drop defattr
|
||||
- Build documentation
|
||||
|
||||
* Sat Apr 23 2011 Jerry James <loganjerry@gmail.com> - 1.4-1
|
||||
- New upstream version
|
||||
- Build for both python2 and python3
|
||||
- Drop BuildRoot, clean script, and clean at start of install script
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.0.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
|
||||
|
||||
* Wed Jan 20 2010 Conrad Meyer <konrad@tylerc.org> - 1.0.1-1
|
||||
- Bump version to 1.0.1.
|
||||
- License changed LGPLv2+ -> BSD.
|
||||
|
||||
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Tue Mar 24 2009 Conrad Meyer <konrad@tylerc.org> - 0.99-3
|
||||
- Replace __python macros with direct python invocations.
|
||||
- Disable checks for now.
|
||||
- Replace a define with global.
|
||||
|
||||
* Thu Mar 12 2009 Conrad Meyer <konrad@tylerc.org> - 0.99-2
|
||||
- License is really LGPLv2+.
|
||||
- Include license as documentation.
|
||||
- Add a check section to run tests.
|
||||
|
||||
* Sat Dec 13 2008 Conrad Meyer <konrad@tylerc.org> - 0.99-1
|
||||
- Initial package.
|
||||
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
6
plans/tests.fmf
Normal file
6
plans/tests.fmf
Normal file
@ -0,0 +1,6 @@
|
||||
summary: python-networkx test plan
|
||||
discover:
|
||||
how: fmf
|
||||
execute:
|
||||
how: tmt
|
||||
|
||||
10
python-networkx-doc.patch
Normal file
10
python-networkx-doc.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- doc/conf.py.orig 2023-04-04 13:40:23.000000000 -0600
|
||||
+++ doc/conf.py 2023-04-07 16:30:21.987007962 -0600
|
||||
@@ -51,6 +51,7 @@ sphinx_gallery_conf = {
|
||||
"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
|
||||
try:
|
||||
11
python-networkx-test.patch
Normal file
11
python-networkx-test.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- networkx/algorithms/approximation/tests/test_traveling_salesman.py.orig 2023-10-28 02:35:40.000000000 -0600
|
||||
+++ networkx/algorithms/approximation/tests/test_traveling_salesman.py 2023-12-06 08:26:09.925416128 -0700
|
||||
@@ -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
|
||||
|
||||
17
python-networkx-unpin-nbconvert.patch
Normal file
17
python-networkx-unpin-nbconvert.patch
Normal file
@ -0,0 +1,17 @@
|
||||
--- pyproject.toml.orig 2023-10-28 04:35:40.000000000 -0400
|
||||
+++ pyproject.toml 2024-01-01 09:59:23.651954876 -0500
|
||||
@@ -75,7 +75,6 @@
|
||||
'pillow>=9.4',
|
||||
'nb2plots>=0.7',
|
||||
'texext>=0.6.7',
|
||||
- 'nbconvert<7.9',
|
||||
]
|
||||
extra = [
|
||||
'lxml>=4.6',
|
||||
--- requirements/doc.txt.orig 2023-10-28 04:35:40.000000000 -0400
|
||||
+++ requirements/doc.txt 2024-01-01 09:59:23.651954876 -0500
|
||||
@@ -7,4 +7,3 @@
|
||||
pillow>=9.4
|
||||
nb2plots>=0.7
|
||||
texext>=0.6.7
|
||||
-nbconvert<7.9
|
||||
516
python-networkx.spec
Normal file
516
python-networkx.spec
Normal file
@ -0,0 +1,516 @@
|
||||
# There is a bootstrap loop between libpysal and networkx when tests/docs are
|
||||
# enabled
|
||||
%bcond_with bootstrap
|
||||
|
||||
# Whether to build documentation and run tests
|
||||
%if %{without bootstrap} && 0%{?rhel} == 0
|
||||
%bcond_without doctest
|
||||
%else
|
||||
%bcond_with doctest
|
||||
%endif
|
||||
|
||||
Name: python-networkx
|
||||
Version: 3.2.1
|
||||
Release: 6%{?dist}
|
||||
Summary: Creates and Manipulates Graphs and Networks
|
||||
License: BSD-3-Clause
|
||||
URL: https://networkx.org/
|
||||
Source0: https://github.com/networkx/networkx/archive/networkx-%{version}.tar.gz
|
||||
# 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
|
||||
# Temporary workaround for a failing test.
|
||||
# See https://github.com/networkx/networkx/issues/5913
|
||||
Patch1: %{name}-test.patch
|
||||
# Remove nbconvert upper pin (revert #6984) (#7083)
|
||||
# https://github.com/networkx/networkx/commit/7394b61059c0bb84f6386eb301f8ccad60e7045d
|
||||
# Patch re-created to work with -p0 like the existing patches.
|
||||
Patch2: %{name}-unpin-nbconvert.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: python3-devel
|
||||
|
||||
%if %{with doctest}
|
||||
# Tests
|
||||
BuildRequires: %{py3_dist pytest-mpl}
|
||||
|
||||
# Documentation
|
||||
BuildRequires: python-pygraphviz-doc
|
||||
BuildRequires: python3-docs
|
||||
BuildRequires: python3-numpy-doc
|
||||
BuildRequires: %{py3_dist geopandas}
|
||||
BuildRequires: %{py3_dist libpysal}
|
||||
BuildRequires: sympy-doc
|
||||
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.
|
||||
|
||||
%package -n python3-networkx
|
||||
Summary: Creates and Manipulates Graphs and Networks
|
||||
Recommends: xdg-utils
|
||||
|
||||
%description -n python3-networkx
|
||||
NetworkX is a Python 3 package for the creation, manipulation, and
|
||||
study of the structure, dynamics, and functions of complex networks.
|
||||
|
||||
%if %{with doctest}
|
||||
%package doc
|
||||
# The content is BSD-3-Clause. Other licenses are due to files copied in by
|
||||
# Sphinx.
|
||||
# _static/_sphinx_javascript_frameworks_compat.js: BSD-2-Clause
|
||||
# _static/basic.css: BSD-2-Clause
|
||||
# _static/binder_badge_logo.svg: BSD-3-Clause
|
||||
# _static/broken_example.png: BSD-3-Clause
|
||||
# _static/copybutton.js
|
||||
# _static/custom.css: BSD-3-Clause
|
||||
# _static/doctools.js: BSD-2-Clause
|
||||
# _static/documentation_options.js: BSD-2-Clause
|
||||
# _static/file.png: BSD-2-Clause
|
||||
# _static/jquery*.js: MIT
|
||||
# _static/language_data.js: BSD-2-Clause
|
||||
# _static/minus.png: BSD-2-Clause
|
||||
# _static/no_image.png: BSD-3-Clause
|
||||
# _static/opensearch.xml: BSD-2-Clause
|
||||
# _static/plus.png: BSD-2-Clause
|
||||
# _static/scripts/pydata-sphinx-theme.js: BSD-3-Clause
|
||||
# _static/searchtools.js: BSD-2-Clause
|
||||
# _static/sg_gallery.css: BSD-3-Clause
|
||||
# _static/sg_gallery-binder.css: BSD-3-Clause
|
||||
# _static/sg_gallery-dataframe.css: BSD-3-Clause
|
||||
# _static/sg_gallery-rendered-html.css: BSD-3-Clause
|
||||
# _static/sphinx_highlight.js: BSD-2-Clause
|
||||
# _static/styles/pydata-sphinx-theme.css: BSD-3-Clause
|
||||
# _static/styles/theme.css: BSD-3-Clause
|
||||
# _static/underscore*.js: MIT
|
||||
# genindex.html: BSD-2-Clause
|
||||
# search.html: BSD-2-Clause
|
||||
# searchindex.js: BSD-2-Clause
|
||||
License: BSD-3-Clause AND BSD-2-Clause AND MIT
|
||||
Summary: Documentation for networkx
|
||||
Requires: fontawesome-fonts-all
|
||||
Provides: bundled(js-jquery)
|
||||
Provides: bundled(js-underscore)
|
||||
|
||||
%description doc
|
||||
Documentation for networkx
|
||||
|
||||
%pyproject_extras_subpkg -n python3-networkx extra
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -p0 -n networkx-networkx-%{version}
|
||||
|
||||
%if %{with doctest}
|
||||
# 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"|' \
|
||||
-e 's|\("https://pygraphviz.github.io/documentation/stable/", \)None|\1"%{_docdir}/python-pygraphviz/html/objects.inv"|' \
|
||||
-e 's|\("https://docs.sympy.org/latest/", \)None|\1"%{_docdir}/sympy-doc/html/objects.inv"|' \
|
||||
-i doc/conf.py
|
||||
%endif
|
||||
|
||||
# Permit older versions of doc packages where Fedora is behind
|
||||
sed -e 's/\(sphinx-gallery>=\)0\.14/\10.11.1/' \
|
||||
-i pyproject.toml requirements/doc.txt
|
||||
|
||||
# Fedora does not have osmnx or momepy
|
||||
sed -i '/osmnx/d;/momepy/d' requirements/example.txt
|
||||
|
||||
%generate_buildrequires
|
||||
%pyproject_buildrequires %{?with_doctest:-x doc,extra,test requirements/example.txt}
|
||||
|
||||
%build
|
||||
%pyproject_wheel
|
||||
|
||||
%if %{with doctest}
|
||||
# Build the documentation
|
||||
PYTHONPATH=$PWD/build/lib make -C doc html
|
||||
rst2html --no-datestamp README.rst README.html
|
||||
%endif
|
||||
|
||||
%install
|
||||
%pyproject_install
|
||||
%pyproject_save_files networkx
|
||||
|
||||
%if %{with doctest}
|
||||
# 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
|
||||
|
||||
%check
|
||||
export FLEXIBLAS=NETLIB
|
||||
%if %{with doctest}
|
||||
%pytest
|
||||
%else
|
||||
%pyproject_check_import -e '*.tests.*' -e '*.conftest'
|
||||
%endif
|
||||
|
||||
%files -n python3-networkx -f %{pyproject_files}
|
||||
%if %{with doctest}
|
||||
%doc README.html
|
||||
%endif
|
||||
|
||||
%if %{with doctest}
|
||||
%files doc
|
||||
%doc doc/build/html/*
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.2.1-6
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.2.1-5
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* Sat Jan 27 2024 Jerry James <loganjerry@gmail.com> - 3.2.1-4
|
||||
- Test with netlib
|
||||
|
||||
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Mon Jan 01 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 3.2.1-2
|
||||
- Remove the upper bound on the version of python-nbconvert (fix RHBZ#2256372)
|
||||
|
||||
* Tue Dec 5 2023 Jerry James <loganjerry@gmail.com> - 3.2.1-1
|
||||
- Version 3.2.1
|
||||
- Bring back the test patch
|
||||
|
||||
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jul 20 2023 Python Maint <python-maint@redhat.com> - 3.1-3
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 3.1-2
|
||||
- Bootstrap for Python 3.12
|
||||
|
||||
* 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
|
||||
|
||||
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Tue Dec 13 2022 Jerry James <loganjerry@gmail.com> - 2.8.8-1
|
||||
- Version 2.8.8
|
||||
- Clarify license of the doc subpackage
|
||||
|
||||
* Sat Oct 1 2022 Jerry James <loganjerry@gmail.com> - 2.8.7-1
|
||||
- Version 2.8.7
|
||||
- Drop upstreamed matplotlib patch
|
||||
|
||||
* Wed Aug 31 2022 Jerry James <loganjerry@gmail.com> - 2.8.6-2
|
||||
- Add patch to adapt an example to matplotlib 3.6.0
|
||||
|
||||
* Mon Aug 22 2022 Jerry James <loganjerry@gmail.com> - 2.8.6-1
|
||||
- Version 2.8.6
|
||||
- Convert License tag to SPDX
|
||||
|
||||
* Tue Aug 2 2022 Jerry James <loganjerry@gmail.com> - 2.8.5-1
|
||||
- Version 2.8.5
|
||||
- Add -test patch to work around a test failure
|
||||
|
||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Jun 23 2022 Python Maint <python-maint@redhat.com> - 2.8.3-3
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Wed Jun 15 2022 Python Maint <python-maint@redhat.com> - 2.8.3-2
|
||||
- Bootstrap for Python 3.11
|
||||
|
||||
* Wed Jun 8 2022 Jerry James <loganjerry@gmail.com> - 2.8.3-1
|
||||
- Version 2.8.3
|
||||
|
||||
* Wed May 18 2022 Jerry James <loganjerry@gmail.com> - 2.8.1-1
|
||||
- Version 2.8.1
|
||||
|
||||
* Wed Apr 20 2022 Jerry James <loganjerry@gmail.com> - 2.8-1
|
||||
- Version 2.8
|
||||
- Bring back the doc subpackage
|
||||
|
||||
* Tue Mar 29 2022 Jerry James <loganjerry@gmail.com> - 2.7.1-1
|
||||
- Version 2.7.1
|
||||
- Do not build documentation by default
|
||||
- Reorganize BRs and Rs by type (extras, tests, docs, etc.)
|
||||
|
||||
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Oct 29 2021 Jerry James <loganjerry@gmail.com> - 2.6.3-2
|
||||
- Change igraph dependency to match change in Rawhide
|
||||
- Update project URL
|
||||
|
||||
* Fri Sep 10 2021 Jerry James <loganjerry@gmail.com> - 2.6.3-1
|
||||
- Version 2.6.3
|
||||
|
||||
* Wed Aug 25 2021 Jerry James <loganjerry@gmail.com> - 2.6.2-1
|
||||
- Version 2.6.2
|
||||
- Drop upstreamed -pyyaml patch
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.5.1-3
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Tue May 4 2021 Jerry James <loganjerry@gmail.com> - 2.5.1-2
|
||||
- Allow use of decorator >= 5.0.7
|
||||
|
||||
* Tue Apr 6 2021 Jerry James <loganjerry@gmail.com> - 2.5.1-1
|
||||
- Verion 2.5.1
|
||||
|
||||
* Tue Jan 26 2021 Jerry James <loganjerry@gmail.com> - 2.5-3
|
||||
- Add -pyyaml patch to fix FTBFS
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
||||
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.3-4
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu May 16 2019 Jerry James <loganjerry@gmail.com> - 2.3-2
|
||||
- Merge the -test subpackage back into the main package (bz 1708372)
|
||||
|
||||
* 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)
|
||||
|
||||
* Fri Mar 09 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.11-10
|
||||
- Update Python 2 dependency declarations to new packaging standards
|
||||
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Dec 07 2017 Merlin Mathesius <mmathesi@redhat.com> - 1.11-8
|
||||
- Cleanup spec file conditionals
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Dec 23 2016 Orion Poplawski <orion@cora.nwra.com> - 1.11-5
|
||||
- Add patch to fix sphinx build
|
||||
|
||||
* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 1.11-5
|
||||
- Rebuild for Python 3.6
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-4
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
* Thu Apr 14 2016 Jerry James <loganjerry@gmail.com> - 1.11-3
|
||||
- Change pydot dependencies to pydotplus (bz 1326957)
|
||||
|
||||
* Sat Apr 2 2016 Jerry James <loganjerry@gmail.com> - 1.11-2
|
||||
- Fix gdal and pydot dependencies
|
||||
|
||||
* Sat Mar 5 2016 Jerry James <loganjerry@gmail.com> - 1.11-1
|
||||
- New upstream version
|
||||
- Drop upstreamed -numpy patch
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Mon Feb 1 2016 Jerry James <loganjerry@gmail.com> - 1.10-1
|
||||
- Comply with latest python packaging guidelines (bz 1301767)
|
||||
|
||||
* Tue Dec 1 2015 Jerry James <loganjerry@gmail.com> - 1.10-1
|
||||
- New upstream version
|
||||
- Update URLs
|
||||
- Add -numpy patch to fix test failure
|
||||
|
||||
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
|
||||
|
||||
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat Feb 21 2015 Jerry James <loganjerry@gmail.com> - 1.9.1-3
|
||||
- Note bundled jquery
|
||||
|
||||
* Tue Oct 7 2014 Jerry James <loganjerry@gmail.com> - 1.9.1-2
|
||||
- Fix python3-networkx-drawing subpackage (bz 1149980)
|
||||
- Fix python(3)-geo subpackage
|
||||
|
||||
* Mon Sep 22 2014 Jerry James <loganjerry@gmail.com> - 1.9.1-1
|
||||
- New upstream version
|
||||
- Fix license handling
|
||||
|
||||
* Thu Jul 10 2014 Jerry James <loganjerry@gmail.com> - 1.9-2
|
||||
- BR python-setuptools
|
||||
|
||||
* Tue Jul 8 2014 Jerry James <loganjerry@gmail.com> - 1.9-1
|
||||
- New upstream version
|
||||
- Drop upstreamed -test-rounding-fix patch
|
||||
- Upstream no longer bundles python-decorator; drop the workaround
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed May 14 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1.8.1-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
|
||||
|
||||
* Thu Mar 13 2014 Pádraig Brady <pbrady@redhat.com> - 1.8.1-12
|
||||
- Split to subpackages and support EL6 and EL7
|
||||
|
||||
* Thu Oct 3 2013 Jerry James <loganjerry@gmail.com> - 1.8.1-2
|
||||
- Update project and source URLs
|
||||
|
||||
* Fri Aug 9 2013 Jerry James <loganjerry@gmail.com> - 1.8.1-1
|
||||
- New upstream version
|
||||
|
||||
* Mon Jul 29 2013 Jerry James <loganjerry@gmail.com> - 1.8-1
|
||||
- New upstream version
|
||||
- Add tex-preview BR for documentation
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Mon Aug 6 2012 Jerry James <loganjerry@gmail.com> - 1.7-1
|
||||
- New upstream version
|
||||
|
||||
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Tue Jan 10 2012 Jerry James <loganjerry@gmail.com> - 1.6-2
|
||||
- Mass rebuild for Fedora 17
|
||||
|
||||
* Mon Nov 28 2011 Jerry James <loganjerry@gmail.com> - 1.6-1
|
||||
- New upstream version
|
||||
- Do not use bundled python-decorator
|
||||
- Remove Requires: ipython, needed by one example only
|
||||
- Clean junk files left in /tmp
|
||||
|
||||
* Wed Jun 22 2011 Jerry James <loganjerry@gmail.com> - 1.5-1
|
||||
- New upstream version
|
||||
- Drop defattr
|
||||
- Build documentation
|
||||
|
||||
* Sat Apr 23 2011 Jerry James <loganjerry@gmail.com> - 1.4-1
|
||||
- New upstream version
|
||||
- Build for both python2 and python3
|
||||
- Drop BuildRoot, clean script, and clean at start of install script
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.0.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
|
||||
|
||||
* Wed Jan 20 2010 Conrad Meyer <konrad@tylerc.org> - 1.0.1-1
|
||||
- Bump version to 1.0.1.
|
||||
- License changed LGPLv2+ -> BSD.
|
||||
|
||||
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Tue Mar 24 2009 Conrad Meyer <konrad@tylerc.org> - 0.99-3
|
||||
- Replace __python macros with direct python invocations.
|
||||
- Disable checks for now.
|
||||
- Replace a define with global.
|
||||
|
||||
* Thu Mar 12 2009 Conrad Meyer <konrad@tylerc.org> - 0.99-2
|
||||
- License is really LGPLv2+.
|
||||
- Include license as documentation.
|
||||
- Add a check section to run tests.
|
||||
|
||||
* Sat Dec 13 2008 Conrad Meyer <konrad@tylerc.org> - 0.99-1
|
||||
- Initial package.
|
||||
1
sources
Normal file
1
sources
Normal file
@ -0,0 +1 @@
|
||||
SHA512 (networkx-3.2.1.tar.gz) = 4e64352c5b2746ba5722d9ac877ca13981cf0d109df5403d8f314ed07bb6c12cd0065217a3b13daefb62f5fc74ad2bc28db2839b0d57bca8a975a9da218fadb7
|
||||
63
tests/Sanity/sedta/Makefile
Normal file
63
tests/Sanity/sedta/Makefile
Normal file
@ -0,0 +1,63 @@
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Makefile of /CoreOS/setools/Sanity/sedta
|
||||
# Description: Does sedta work as expected? Does it support all features?
|
||||
# Author: Milos Malik <mmalik@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2019 Red Hat, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License as
|
||||
# published by the Free Software Foundation, either version 2 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be
|
||||
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
# PURPOSE. See the GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
export TEST=/CoreOS/setools/Sanity/sedta
|
||||
export TESTVERSION=1.0
|
||||
|
||||
BUILT_FILES=
|
||||
|
||||
FILES=$(METADATA) runtest.sh Makefile PURPOSE testpolicy.cil
|
||||
|
||||
.PHONY: all install download clean
|
||||
|
||||
run: $(FILES) build
|
||||
./runtest.sh
|
||||
|
||||
build: $(BUILT_FILES)
|
||||
test -x runtest.sh || chmod a+x runtest.sh
|
||||
|
||||
clean:
|
||||
rm -f *~ $(BUILT_FILES)
|
||||
|
||||
include /usr/share/rhts/lib/rhts-make.include
|
||||
|
||||
$(METADATA): Makefile
|
||||
@echo "Owner: Milos Malik <mmalik@redhat.com>" > $(METADATA)
|
||||
@echo "Name: $(TEST)" >> $(METADATA)
|
||||
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
||||
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||
@echo "Description: Does sedta work as expected? Does it support all features?" >> $(METADATA)
|
||||
@echo "Type: Sanity" >> $(METADATA)
|
||||
@echo "TestTime: 1h" >> $(METADATA)
|
||||
@echo "RunFor: setools" >> $(METADATA)
|
||||
@echo "Requires: policycoreutils setools-console-analyses" >> $(METADATA)
|
||||
@echo "Priority: Normal" >> $(METADATA)
|
||||
@echo "License: GPLv2+" >> $(METADATA)
|
||||
@echo "Confidential: no" >> $(METADATA)
|
||||
@echo "Destructive: no" >> $(METADATA)
|
||||
@echo "Releases: -RHEL4 -RHEL6 -RHEL7 -RHELClient5 -RHELServer5" >> $(METADATA)
|
||||
|
||||
rhts-lint $(METADATA)
|
||||
|
||||
3
tests/Sanity/sedta/PURPOSE
Normal file
3
tests/Sanity/sedta/PURPOSE
Normal file
@ -0,0 +1,3 @@
|
||||
PURPOSE of /CoreOS/setools/Sanity/sedta
|
||||
Description: Does sedta work as expected? Does it support all features?
|
||||
Author: Milos Malik <mmalik@redhat.com>
|
||||
30
tests/Sanity/sedta/main.fmf
Normal file
30
tests/Sanity/sedta/main.fmf
Normal file
@ -0,0 +1,30 @@
|
||||
summary: Does sedta work as expected? Does it support all features?
|
||||
description: ''
|
||||
contact: Milos Malik <mmalik@redhat.com>
|
||||
component:
|
||||
- setools
|
||||
test: ./runtest.sh
|
||||
framework: beakerlib
|
||||
recommend:
|
||||
- git
|
||||
- policycoreutils
|
||||
- setools-console-analyses
|
||||
duration: 1h
|
||||
enabled: true
|
||||
tag:
|
||||
- CI-Tier-1
|
||||
- NoRHEL4
|
||||
- NoRHEL5
|
||||
- NoRHEL6
|
||||
- NoRHEL7
|
||||
- TIPfail_Security
|
||||
- f32friendly
|
||||
- f33friendly
|
||||
- targeted
|
||||
adjust:
|
||||
- enabled: false
|
||||
when: distro == rhel-4, rhel-5, rhel-6, rhel-7
|
||||
continue: false
|
||||
extra-nitrate: TC#0604139
|
||||
extra-summary: /CoreOS/setools/Sanity/sedta
|
||||
extra-task: /CoreOS/setools/Sanity/sedta
|
||||
87
tests/Sanity/sedta/runtest.sh
Executable file
87
tests/Sanity/sedta/runtest.sh
Executable file
@ -0,0 +1,87 @@
|
||||
#!/bin/bash
|
||||
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# runtest.sh of /CoreOS/setools/Sanity/sedta
|
||||
# Description: Does sedta work as expected? Does it support all features?
|
||||
# Author: Milos Malik <mmalik@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2019 Red Hat, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License as
|
||||
# published by the Free Software Foundation, either version 2 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be
|
||||
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
# PURPOSE. See the GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
# Include Beaker environment
|
||||
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||
|
||||
PACKAGE="setools"
|
||||
|
||||
rlJournalStart
|
||||
rlPhaseStartSetup
|
||||
rlAssertRpm ${PACKAGE}-console-analyses
|
||||
OUTPUT_FILE=`mktemp`
|
||||
rlRun "semodule -i testpolicy.cil"
|
||||
rlRun "semodule -l | grep testpolicy"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "invalid values"
|
||||
rlRun "sedta -s unknown_t >& ${OUTPUT_FILE}" 1
|
||||
rlRun "grep -i 'not a valid type' ${OUTPUT_FILE}"
|
||||
rlRun "sedta -s apmd_t -t unknown_t -S >& ${OUTPUT_FILE}" 1
|
||||
rlRun "grep -i 'not a valid type' ${OUTPUT_FILE}"
|
||||
rlRun "sedta -s unknown_t -p /etc/selinux/unknown/policy/policy.31 >& ${OUTPUT_FILE}" 1
|
||||
rlRun "grep -i 'no such file or directory' ${OUTPUT_FILE}"
|
||||
rlRun "sedta -s apmd_t -t var_lib_t -A -1 >& ${OUTPUT_FILE}" 1
|
||||
rlRun "grep -i 'must be positive' ${OUTPUT_FILE}"
|
||||
rlRun "sedta -s xyz_t >& ${OUTPUT_FILE}"
|
||||
rlRun "grep -i '^0.*transition.*found' ${OUTPUT_FILE}"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest "valid values"
|
||||
# transitivity
|
||||
rlRun "sedta -s first_t -t second_t -S >& ${OUTPUT_FILE}"
|
||||
rlRun "grep -i '^1 domain transition path.*found' ${OUTPUT_FILE}"
|
||||
rlRun "sedta -s second_t -t third_t -S >& ${OUTPUT_FILE}"
|
||||
rlRun "grep -i '^1 domain transition path.*found' ${OUTPUT_FILE}"
|
||||
rlRun "sedta -s first_t -t third_t -S >& ${OUTPUT_FILE}"
|
||||
rlRun "grep -i '^1 domain transition path.*found' ${OUTPUT_FILE}"
|
||||
# reflexivity
|
||||
rlRun "sedta -s first_t -t first_t -S >& ${OUTPUT_FILE}"
|
||||
rlRun "grep -i '^1 domain transition path.*found' ${OUTPUT_FILE}"
|
||||
rlRun "sedta -s second_t -t second_t -S >& ${OUTPUT_FILE}"
|
||||
rlRun "grep -i '^1 domain transition path.*found' ${OUTPUT_FILE}"
|
||||
rlRun "sedta -s third_t -t third_t -S >& ${OUTPUT_FILE}"
|
||||
rlRun "grep -i '^1 domain transition path.*found' ${OUTPUT_FILE}"
|
||||
# path is longer than limit
|
||||
rlRun "sedta -s first_t -t third_t -A 1 >& ${OUTPUT_FILE}"
|
||||
rlRun "grep -i '^0 domain transition path.*found' ${OUTPUT_FILE}"
|
||||
# non-existent relation
|
||||
rlRun "sedta -s first_t -t third_t -S -r >& ${OUTPUT_FILE}"
|
||||
rlRun "grep -i '^0 domain transition path.*found' ${OUTPUT_FILE}"
|
||||
# non-existent relation
|
||||
rlRun "sedta -s third_t -t first_t -S >& ${OUTPUT_FILE}"
|
||||
rlRun "grep -i '^0 domain transition path.*found' ${OUTPUT_FILE}"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartCleanup
|
||||
rlRun "semodule -r testpolicy"
|
||||
rlRun "semodule -l | grep testpolicy" 1
|
||||
rm -f ${OUTPUT_FILE}
|
||||
rlPhaseEnd
|
||||
rlJournalPrintText
|
||||
rlJournalEnd
|
||||
|
||||
21
tests/Sanity/sedta/testpolicy.cil
Normal file
21
tests/Sanity/sedta/testpolicy.cil
Normal file
@ -0,0 +1,21 @@
|
||||
( type xyz_t )
|
||||
|
||||
( type first_t )
|
||||
( type first_exec_t )
|
||||
( type second_t )
|
||||
( type second_exec_t )
|
||||
( type third_t )
|
||||
( type third_exec_t )
|
||||
|
||||
( typetransition first_t second_exec_t process second_t )
|
||||
( typetransition second_t third_exec_t process third_t )
|
||||
|
||||
( allow first_t second_exec_t ( file ( getattr open read execute )))
|
||||
( allow first_t second_t ( process ( transition )))
|
||||
( allow second_t third_exec_t ( file ( getattr open read execute )))
|
||||
( allow second_t third_t ( process ( transition )))
|
||||
|
||||
( allow first_t first_exec_t ( file ( entrypoint )))
|
||||
( allow second_t second_exec_t ( file ( entrypoint )))
|
||||
( allow third_t third_exec_t ( file ( entrypoint )))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user