diff --git a/python-networkx.changes b/python-networkx.changes index 222a166..9d3055d 100644 --- a/python-networkx.changes +++ b/python-networkx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 22 00:41:03 UTC 2019 - steven.kowalik@suse.com + +- Drop incorrectly calculated dependency on python33 +- Switch to using %pytest macro + ------------------------------------------------------------------- Sun Nov 17 23:53:12 UTC 2019 - Steve Kowalik diff --git a/python-networkx.spec b/python-networkx.spec index 7e339f2..73bae82 100644 --- a/python-networkx.spec +++ b/python-networkx.spec @@ -1,7 +1,7 @@ # # spec file for package python-networkx # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,7 +33,7 @@ BuildRequires: %{python_module decorator >= 3.4.0} BuildRequires: %{python_module matplotlib} BuildRequires: %{python_module pydot} BuildRequires: %{python_module pyparsing} -BuildRequires: %{python_module pytest3} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module scipy} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -89,7 +89,8 @@ fi %{python_expand pushd %{buildroot}%{$python_sitelib} # Fix wrong-script-interpreter -find networkx -name '*test*.py' -exec sed -i "s|#!%{_bindir}/env python|#!%__$python|" {} + +find networkx -name '*test*.py' -exec sed -i "s|#!%{_bindir}/env python$|#!%__$python|" {} + +find networkx -name '*test*.py' -exec sed -i "s|#!%{_bindir}/env python3$|#!%__$python|" {} + find networkx -name '*test*.py' -exec grep -q '#!%__$python' {} \; -exec chmod a+x {} + # Deduplicating files can generate a RPMLINT warning for pyc mtime find networkx -name '*test*.py' -exec $python -m compileall -d %{$python_sitelib} {} \; @@ -101,7 +102,7 @@ popd %check # test excluded because it leads to crashes on i586, gh#networkx/networkx#3304 -py.test3 -vv -k 'not test_subgraph_centrality_big_graph' +%pytest -k 'not test_subgraph_centrality_big_graph' %files %{python_files} %license LICENSE.txt