rpms/scipy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 1.2.1

Browse Source 
Drop scipy2-doc
This commit is contained in:
Orion Poplawski 2019-04-23 21:28:06 -06:00
parent 98a80e211d
commit 32c93448e8
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -25,3 +25,4 @@ scipy-0.7.2.tar.gz
/scipy-1.0.0.tar.xz /scipy-1.0.0.tar.xz
/scipy-1.1.0.tar.gz /scipy-1.1.0.tar.gz
/scipy-1.2.0.tar.gz /scipy-1.2.0.tar.gz
/scipy-1.2.1.tar.gz

18
scipy.spec
View File

@ -6,7 +6,7 @@
Summary: Scientific Tools for Python Summary: Scientific Tools for Python
Name: scipy Name: scipy
Version: 1.2.0 Version: 1.2.1
Release: 1%{?dist} Release: 1%{?dist}
# BSD -- whole package except: # BSD -- whole package except:
@ -33,6 +33,7 @@ BuildRequires: atlas-devel
%endif %endif
BuildRequires: gcc-gfortran, swig, gcc-c++ BuildRequires: gcc-gfortran, swig, gcc-c++
BuildRequires: qhull-devel BuildRequires: qhull-devel
BuildRequires: /usr/bin/pathfix.py
BuildRequires: python3-numpy, python3-devel, python3-numpy-f2py BuildRequires: python3-numpy, python3-devel, python3-numpy-f2py
BuildRequires: python3-setuptools BuildRequires: python3-setuptools
@ -41,9 +42,11 @@ BuildRequires: python3-pytest-xdist
BuildRequires: python3-pytest-timeout BuildRequires: python3-pytest-timeout
%if %{with doc} %if %{with doc}
%if 0%{?fedora} < 31
BuildRequires: python2-sphinx BuildRequires: python2-sphinx
BuildRequires: python2-matplotlib BuildRequires: python2-matplotlib
BuildRequires: python2-numpydoc BuildRequires: python2-numpydoc
%endif
BuildRequires: python3-sphinx BuildRequires: python3-sphinx
BuildRequires: python3-matplotlib BuildRequires: python3-matplotlib
BuildRequires: python3-numpydoc BuildRequires: python3-numpydoc
@ -151,18 +154,25 @@ for PY in %{python3_version} %{python2_version}; do
build build
%if %{with doc} %if %{with doc}
# No python2-sphinx on Fedora 31+
if [ $PY == %{python3_version} -o 0%{?fedora} -lt 31 ]
then
pushd doc pushd doc
export PYTHONPATH=$(echo ../build/lib.linux-*-$PY/) export PYTHONPATH=$(echo ../build/lib.linux-*-$PY/)
make html SPHINXBUILD=sphinx-build-$PY make html SPHINXBUILD=sphinx-build-$PY
rm -rf build/html/.buildinfo rm -rf build/html/.buildinfo
mv build build-$PY mv build build-$PY
popd popd
fi
%endif %endif
done done
%install %install
%py3_install %py3_install
%py2_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 %check
# Skip all tests on s390x because they hangs unexpectedly and randomly # Skip all tests on s390x because they hangs unexpectedly and randomly
@ -206,7 +216,7 @@ popd
%{python2_sitearch}/scipy/ %{python2_sitearch}/scipy/
%{python2_sitearch}/*.egg-info %{python2_sitearch}/*.egg-info
%if %{with doc} %if %{with doc} && 0%{?fedora} < 31
%files -n python2-scipy-doc %files -n python2-scipy-doc
%license LICENSE.txt %license LICENSE.txt
%doc doc/build-%{python2_version}/html %doc doc/build-%{python2_version}/html
@ -224,6 +234,10 @@ popd
%endif # with doc %endif # with doc
%changelog %changelog
* Tue Apr 23 2019 Orion Poplawski <orion@nwra.com> - 1.2.1-1
- Update to 1.2.1
- Drop scipy2-doc
* Wed Feb 06 2019 Charalampos Stratakis <cstratak@redhat.com> - 1.2.0-1 * Wed Feb 06 2019 Charalampos Stratakis <cstratak@redhat.com> - 1.2.0-1
- Update to 1.2.0 - Update to 1.2.0

2
sources
View File

@ -1 +1 @@
SHA512 (scipy-1.2.0.tar.gz) = e5355a79832644a68fd21c21d4033171bf5ffa94ca601165524192ca4b8d7c7437a9ac83e7672bd942f9cec14504e957924ba5583cd02b0c1ca52ee2214c7b25 SHA512 (scipy-1.2.1.tar.gz) = 80caf9af93046c0d58829a61eb90d824aabe8a53f3e7d8a72efc44accaa3299d1e22adbb4852ed192cee6e47aafbb4ebea3115233ed11f1ef05dd373866b0243