| |
@@ -6,8 +6,8 @@
|
| |
|
| |
Summary: Scientific Tools for Python
|
| |
Name: scipy
|
| |
- Version: 1.2.1
|
| |
- Release: 3%{?dist}
|
| |
+ Version: 1.3.0
|
| |
+ Release: 1%{?dist}
|
| |
|
| |
# BSD -- whole package except:
|
| |
# Boost -- scipy/special/cephes/scipy_iv.c
|
| |
@@ -21,10 +21,6 @@
|
| |
# https://stackoverflow.com/a/47731333/1839451
|
| |
Patch0: acceptable_failure_rate.patch
|
| |
|
| |
- BuildRequires: python2-numpy, python2-devel,python2-numpy-f2py
|
| |
- BuildRequires: python2-pytest
|
| |
- BuildRequires: python2-pytest-xdist
|
| |
- BuildRequires: python2-pytest-timeout
|
| |
BuildRequires: fftw-devel, blas-devel, lapack-devel, suitesparse-devel
|
| |
%ifarch %{openblas_arches}
|
| |
BuildRequires: openblas-devel
|
| |
@@ -64,32 +60,7 @@
|
| |
leading scientists and engineers.
|
| |
|
| |
|
| |
- %package -n python2-scipy
|
| |
- Summary: Scientific Tools for Python
|
| |
- Requires: numpy, f2py
|
| |
- %{?python_provide:%python_provide python2-scipy}
|
| |
- # General provides of plain 'scipy' in F24
|
| |
- Provides: scipy = %{version}-%{release}
|
| |
- Provides: scipy%{?_isa} = %{version}-%{release}
|
| |
- Obsoletes: scipy <= 0.16.0
|
| |
- %description -n python2-scipy
|
| |
- Scipy is open-source software for mathematics, science, and
|
| |
- engineering. The core library is NumPy which provides convenient and
|
| |
- fast N-dimensional array manipulation. The SciPy library is built to
|
| |
- work with NumPy arrays, and provides many user-friendly and efficient
|
| |
- numerical routines such as routines for numerical integration and
|
| |
- optimization. Together, they run on all popular operating systems, are
|
| |
- quick to install, and are free of charge. NumPy and SciPy are easy to
|
| |
- use, but powerful enough to be depended upon by some of the world's
|
| |
- leading scientists and engineers.
|
| |
-
|
| |
%if %{with doc}
|
| |
- %package -n python2-scipy-doc
|
| |
- Summary: Scientific Tools for Python - documentation
|
| |
- Requires: python2-scipy = %{version}-%{release}
|
| |
- %description -n python2-scipy-doc
|
| |
- HTML documentation for Scipy
|
| |
-
|
| |
%package -n python3-scipy-doc
|
| |
Summary: Scientific Tools for Python - documentation
|
| |
Requires: python3-scipy = %{version}-%{release}
|
| |
@@ -140,7 +111,7 @@
|
| |
|
| |
|
| |
%build
|
| |
- for PY in %{python3_version} %{python2_version}; do
|
| |
+ for PY in %{python3_version}; do
|
| |
env CFLAGS="$RPM_OPT_FLAGS -lm" \
|
| |
FFLAGS="$RPM_OPT_FLAGS -fPIC" \
|
| |
%ifarch %{openblas_arches}
|
| |
@@ -154,24 +125,18 @@
|
| |
build
|
| |
|
| |
%if %{with doc}
|
| |
- # No python2-sphinx on Fedora 31+
|
| |
- if [ $PY == %{python3_version} -o 0%{?fedora} -lt 31 ]
|
| |
- then
|
| |
- pushd doc
|
| |
- export PYTHONPATH=$(echo ../build/lib.linux-*-$PY/)
|
| |
- make html SPHINXBUILD=sphinx-build-$PY
|
| |
- rm -rf build/html/.buildinfo
|
| |
- mv build build-$PY
|
| |
- popd
|
| |
- fi
|
| |
+ pushd doc
|
| |
+ export PYTHONPATH=$(echo ../build/lib.linux-*-$PY/)
|
| |
+ make html SPHINXBUILD=sphinx-build-$PY
|
| |
+ rm -rf build/html/.buildinfo
|
| |
+ mv build build-$PY
|
| |
+ popd
|
| |
%endif
|
| |
done
|
| |
|
| |
%install
|
| |
%py3_install
|
| |
- %py2_install
|
| |
# Some files got ambiguous python shebangs, we fix them after everything else is done
|
| |
- pathfix.py -pni "%{__python2} %{py2_shbang_opts}" %{buildroot}%{python2_sitearch}
|
| |
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{python3_sitearch}
|
| |
|
| |
%check
|
| |
@@ -207,23 +172,6 @@
|
| |
rm -rf gram{A,B}
|
| |
popd
|
| |
|
| |
- pushd %{buildroot}/%{python2_sitearch}
|
| |
- py.test-2 --timeout=300 -k "$k" scipy
|
| |
- # Remove test remnants
|
| |
- rm -f gram{A,B}
|
| |
- popd
|
| |
-
|
| |
-
|
| |
- %files -n python2-scipy
|
| |
- %doc LICENSE.txt
|
| |
- %{python2_sitearch}/scipy/
|
| |
- %{python2_sitearch}/*.egg-info
|
| |
-
|
| |
- %if %{with doc} && 0%{?fedora} < 31
|
| |
- %files -n python2-scipy-doc
|
| |
- %license LICENSE.txt
|
| |
- %doc doc/build-%{python2_version}/html
|
| |
- %endif # with doc
|
| |
|
| |
%files -n python3-scipy
|
| |
%doc LICENSE.txt
|
| |
@@ -237,6 +185,10 @@
|
| |
%endif # with doc
|
| |
|
| |
%changelog
|
| |
+ * Mon May 20 2019 Orion Poplawski <orion@nwra.com> - 1.3.0-1
|
| |
+ - Update to 1.3.0
|
| |
+ - Drop python2 packages
|
| |
+
|
| |
* Thu May 16 2019 Orion Poplawski <orion@nwra.com> - 1.2.1-3
|
| |
- Build only against openblasp (bugz#1709161)
|
| |
|
| |
Currently does not build, dependencies need to dealt with first as well. See also https://bugzilla.redhat.com/show_bug.cgi?id=1674101