Compare commits
No commits in common. "c8" and "c9s" have entirely different histories.
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
|
|
||||||
@ -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.
|
|
||||||
8
gating.yaml
Normal file
8
gating.yaml
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
#recipients: mmalik,plautrba,vmojzis
|
||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-9
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||||
|
|
||||||
10
python-networkx-doc.patch
Normal file
10
python-networkx-doc.patch
Normal file
@ -0,0 +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
|
||||||
|
"gallery_dirs": "auto_examples",
|
||||||
|
"backreferences_dir": "modules/generated",
|
||||||
|
+ 'expected_failing_examples': ['../examples/graph/plot_football.py']
|
||||||
|
}
|
||||||
|
|
||||||
|
# generate autosummary pages
|
||||||
9
python-networkx-pyyaml.patch
Normal file
9
python-networkx-pyyaml.patch
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
--- 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
|
||||||
11
python-networkx.rpmlintrc
Normal file
11
python-networkx.rpmlintrc
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON
|
||||||
|
# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors
|
||||||
|
|
||||||
|
# Zip files are not text
|
||||||
|
addFilter(r'W: file-not-utf8 .*.zip')
|
||||||
|
|
||||||
|
# Dangling font symlinks: the Requires ensures they will not dangle
|
||||||
|
addFilter(r'W: dangling-symlink .*fonts')
|
||||||
|
|
||||||
|
# We use the versions of jquery and js-underscore that sphinx gives us
|
||||||
|
addFilter(r'W: unversioned-explicit-provides bundled\((jquery|js-underscore)\)')
|
||||||
380
python-networkx.spec
Normal file
380
python-networkx.spec
Normal file
@ -0,0 +1,380 @@
|
|||||||
|
%global srcname networkx
|
||||||
|
|
||||||
|
Name: python-%{srcname}
|
||||||
|
Version: 2.6.2
|
||||||
|
Release: 2%{?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
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
%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}
|
||||||
|
|
||||||
|
%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 doc
|
||||||
|
Summary: Documentation for networkx
|
||||||
|
Requires: font(fontawesome)
|
||||||
|
Requires: font(lato)
|
||||||
|
Requires: font(robotoslab)
|
||||||
|
Provides: bundled(jquery)
|
||||||
|
Provides: bundled(js-underscore)
|
||||||
|
|
||||||
|
%description doc
|
||||||
|
Documentation for networkx
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%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
|
||||||
|
|
||||||
|
# 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
|
||||||
|
|
||||||
|
%build
|
||||||
|
%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
|
||||||
|
|
||||||
|
%install
|
||||||
|
%py3_install
|
||||||
|
mv %{buildroot}%{_docdir}/networkx-%{version} ./installed-docs
|
||||||
|
rm -f installed-docs/INSTALL.txt
|
||||||
|
|
||||||
|
%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
|
||||||
|
|
||||||
|
%check
|
||||||
|
%if 0%{?rhel} == 0
|
||||||
|
pytest
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%files -n python3-networkx
|
||||||
|
%if 0%{?rhel} == 0
|
||||||
|
%doc README.html installed-docs/*
|
||||||
|
%endif
|
||||||
|
%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
|
||||||
|
|
||||||
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.5-4
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* 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-2.6.2.tar.gz) = ba1a225b7f106b11e561cf1de48793626c190c7de31a39e6a55f1aff264df1178d0b8d3545aa23a6e03340dc117722f0ca70b0797fab4bd3081d096e39980f99
|
||||||
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>
|
||||||
88
tests/Sanity/sedta/runtest.sh
Executable file
88
tests/Sanity/sedta/runtest.sh
Executable file
@ -0,0 +1,88 @@
|
|||||||
|
#!/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/bin/rhts-environment.sh || exit 1
|
||||||
|
. /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 )))
|
||||||
|
|
||||||
8
tests/tests.yml
Normal file
8
tests/tests.yml
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
- hosts: localhost
|
||||||
|
roles:
|
||||||
|
- role: standard-test-beakerlib
|
||||||
|
tags:
|
||||||
|
- classic
|
||||||
|
tests:
|
||||||
|
- Sanity/sedta
|
||||||
Loading…
Reference in New Issue
Block a user