From e5a2f382bbe583a7fc3f74d8448a4c804051c2d2 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Thu, 26 Oct 2017 19:04:11 +0200 Subject: [PATCH] update to 1.0.0 and use pytest instead of nose --- .gitignore | 1 + scipy.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index cee976e..db13cf9 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ scipy-0.7.2.tar.gz /scipy-0.18.0.tar.xz /scipy-0.19.0.tar.xz /scipy-0.19.1.tar.xz +/scipy-1.0.0.tar.xz diff --git a/scipy.spec b/scipy.spec index 2055222..55c5853 100644 --- a/scipy.spec +++ b/scipy.spec @@ -10,8 +10,8 @@ Summary: Scientific Tools for Python Name: scipy -Version: 0.19.1 -Release: 5%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Group: Development/Libraries # BSD -- whole package except: @@ -22,6 +22,7 @@ Url: http://www.scipy.org/scipylib/index.html Source0: https://github.com/scipy/scipy/releases/download/v%{version}/scipy-%{version}.tar.xz BuildRequires: numpy, python2-devel,f2py +BuildRequires: python2-pytest BuildRequires: fftw-devel, blas-devel, lapack-devel, suitesparse-devel %ifarch %{openblas_arches} %ifnarch ppc64 @@ -39,7 +40,7 @@ BuildRequires: qhull-devel %if 0%{?with_python3} BuildRequires: python3-numpy, python3-devel, python3-f2py BuildRequires: python3-setuptools -BuildRequires: python3-nose +BuildRequires: python3-pytest %endif %description @@ -138,7 +139,7 @@ env CFLAGS="$RPM_OPT_FLAGS" \ %endif %else ATLAS=%{_libdir}/atlas \ -%endif +%endif FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} \ %__python2 setup.py config_fc \ --fcompiler=gnu95 --noarch build @@ -158,7 +159,7 @@ env CFLAGS="$RPM_OPT_FLAGS" \ %endif %else ATLAS=%{_libdir}/atlas \ -%endif +%endif FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} \ %__python3 setup.py install --root=$RPM_BUILD_ROOT %endif # with_python3 @@ -173,7 +174,7 @@ env CFLAGS="$RPM_OPT_FLAGS" \ %endif %else ATLAS=%{_libdir}/atlas \ -%endif +%endif FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} \ %__python2 setup.py install --root=$RPM_BUILD_ROOT @@ -206,6 +207,9 @@ PYTHONPATH=$RPM_BUILD_ROOT%{python2_sitearch} \ %endif # with_python3 %changelog +* Thu Oct 26 2017 Thomas Spura - 1.0.0-1 +- update to 1.0.0 and use pytest instead of nose + * Wed Oct 04 2017 Christian Dersch - 0.19.1-5 - Use openblas where available (except ppc64), to use same as numpy (BZ 1472318) diff --git a/sources b/sources index c2f552b..c8979b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scipy-0.19.1.tar.xz) = a9c2c95431e6442d3c2557b891e7a54aeed637ecb5a55d2f2391fd599e24be1848505dcd7d27b3eca16d8954ed43838c4e8b207f67ab2a80f1fe95ae492ead73 +SHA512 (scipy-1.0.0.tar.xz) = 541bf377fd67ac15dec55ecd6435a2c0e3043bbdc4fdce05e584db123f113141c8713a07a5895597cb3c3449af493453391ffb1ab9251f054646b4133f651633