diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index f7f2128..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,9 +0,0 @@ -Copyright (c) 2009-2018, Joscha Reimer, Alex Grigorievskiy, Antony Lee, Yuri, Leon Barrett, Dag Sverre Seljebotn, Nathaniel Smith, David Cournapeau - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/python-scikit-sparse.changes b/python-scikit-sparse.changes index b1737b8..d2da649 100644 --- a/python-scikit-sparse.changes +++ b/python-scikit-sparse.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Apr 24 16:29:24 UTC 2021 - Ben Greiner + +- Update to 0.4.5 + * Use PEP-517 style build-system so numpy and cython are no longer + needed prior to installation (openSUSE: we still use + setuptools here) + * Added support for python 3.9 +- Remove nose -- gh#scikit-sparse/pull#66 + ------------------------------------------------------------------- Fri Feb 12 14:12:27 UTC 2021 - Dirk Müller diff --git a/python-scikit-sparse.spec b/python-scikit-sparse.spec index 3fdb81e..52d5bee 100644 --- a/python-scikit-sparse.spec +++ b/python-scikit-sparse.spec @@ -20,7 +20,7 @@ %define skip_python2 1 %define skip_python36 1 Name: python-scikit-sparse -Version: 0.4.4 +Version: 0.4.5 Release: 0 # For license file %define tag c94f8418b6c36c3ff9db4f87e00fc08bd51cfb4b @@ -29,17 +29,15 @@ License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Development/Languages/Python URL: https://github.com/scikit-sparse/scikit-sparse/ Source: https://files.pythonhosted.org/packages/source/s/scikit-sparse/scikit-sparse-%{version}.tar.gz -Source10: https://raw.githubusercontent.com/scikit-sparse/scikit-sparse/%{tag}/LICENSE.txt BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel} -BuildRequires: %{python_module numpy-devel >= 1.13} +BuildRequires: %{python_module numpy-devel >= 1.13.3} BuildRequires: %{python_module scipy >= 0.19} BuildRequires: %{python_module setuptools >= 18.0} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: suitesparse-devel # SECTION test requirements -BuildRequires: %{python_module nose} BuildRequires: %{python_module pytest} # /SECTION Requires: python-numpy >= 1.12 @@ -60,8 +58,8 @@ decomposition. %prep %setup -q -n scikit-sparse-%{version} -cp %{SOURCE10} . -rm -r .eggs +# no need for nose here -- gh#scikit-sparse/pull#66 +sed -i 's/from nose.tools import assert_raises/from pytest import raises as assert_raises/' sksparse/test_cholmod.py %build export CFLAGS="%{optflags}" @@ -72,19 +70,12 @@ export CFLAGS="%{optflags}" %python_expand %fdupes %{buildroot}%{$python_sitearch} %check -mkdir -p tester -pushd tester -ln -s ../sksparse/test_*.py . -ln -s ../sksparse/test_data . -%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} -py.test-%{$python_bin_suffix} -} -popd +%pytest_arch -ra --pyargs sksparse %files %{python_files} -%doc doc/changes.rst %doc README.md %license LICENSE.txt -%{python_sitearch}/* +%{python_sitearch}/sksparse +%{python_sitearch}/scikit_sparse-%{version}*-info %changelog diff --git a/scikit-sparse-0.4.4.tar.gz b/scikit-sparse-0.4.4.tar.gz deleted file mode 100644 index 0e5f9b1..0000000 --- a/scikit-sparse-0.4.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9e6741ab0a43f43071e123d7d6250c9d60373308e55f0a0c5488b8eec4df319 -size 385735 diff --git a/scikit-sparse-0.4.5.tar.gz b/scikit-sparse-0.4.5.tar.gz new file mode 100644 index 0000000..6737c46 --- /dev/null +++ b/scikit-sparse-0.4.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d0cdba40cba1063474fd30bc6d3bf2b74dfb1c1fc81cf6ee45e201933d478f8 +size 209021