From 4cadcb8b148719773d1de2c0a44b5352f99f1407 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 15 Feb 2016 16:26:41 -0700 Subject: [PATCH] Update to 0.17.0 - Drop ctypes patch applied upstream --- .gitignore | 1 + scipy-0.16.1-ctyptes-test.patch | 26 -------------------------- scipy.spec | 15 ++++++++------- sources | 2 +- 4 files changed, 10 insertions(+), 34 deletions(-) delete mode 100644 scipy-0.16.1-ctyptes-test.patch diff --git a/.gitignore b/.gitignore index 06621e5..661411d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ scipy-0.7.2.tar.gz /scipy-0.15.1.tar.gz /scipy-0.16.0.tar.gz /scipy-0.16.1.tar.gz +/scipy-0.17.0.tar.gz diff --git a/scipy-0.16.1-ctyptes-test.patch b/scipy-0.16.1-ctyptes-test.patch deleted file mode 100644 index b6c2f9d..0000000 --- a/scipy-0.16.1-ctyptes-test.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 1f5ccd5447ed2796bb8e9506cfbfdb4a82cccfc0 -Author: Ralf Gommers -Date: Sat Oct 24 18:17:04 2015 +0200 - - TST: fix issue with a ctypes test for integrate on Fedora. Closes gh-5370 - -diff --git a/scipy/integrate/tests/test_quadpack.py b/scipy/integrate/tests/test_quadpack.py -index c3a417c..f384c77 100644 ---- a/scipy/integrate/tests/test_quadpack.py -+++ b/scipy/integrate/tests/test_quadpack.py -@@ -42,7 +42,14 @@ class TestCtypesQuad(TestCase): - file = 'libm.dylib' - else: - file = 'libm.so' -- self.lib = ctypes.CDLL(file) -+ -+ try: -+ self.lib = ctypes.CDLL(file) -+ except OSError: -+ # This test doesn't work on some Linux platforms (Fedora for -+ # example) that put an ld script in libm.so - see gh-5370 -+ self.skipTest("Ctypes can't import libm.so") -+ - restype = ctypes.c_double - argtypes = (ctypes.c_double,) - for name in ['sin', 'cos', 'tan']: diff --git a/scipy.spec b/scipy.spec index efb8c30..96e174a 100644 --- a/scipy.spec +++ b/scipy.spec @@ -10,17 +10,16 @@ Summary: Scientific Tools for Python Name: scipy -Version: 0.16.1 -Release: 7%{?dist} +Version: 0.17.0 +Release: 1%{?dist} Group: Development/Libraries # BSD -- whole package except: # Boost -- scipy/special/cephes/scipy_iv.c # Public Domain -- scipy/odr/__odrpack.c License: BSD and Boost and Public Domain -Url: http://www.scipy.org -Source0: http://downloads.sourceforge.net/scipy/%{name}-%{version}%{?rcver}.tar.gz -Patch0: scipy-0.16.1-ctyptes-test.patch +Url: http://www.scipy.org/scipylib/index.html +Source0: https://pypi.python.org/packages/source/s/scipy/scipy-%{version}.tar.gz BuildRequires: numpy, python2-devel,f2py BuildRequires: fftw-devel, blas-devel, lapack-devel, suitesparse-devel @@ -101,8 +100,6 @@ include_dirs = /usr/include/suitesparse umfpack_libs = umfpack EOF -%patch0 -p1 - %build %if 0%{?with_python3} @@ -164,6 +161,10 @@ PYTHONPATH=$RPM_BUILD_ROOT%{python2_sitearch} \ %endif # with_python3 %changelog +* Mon Feb 15 2016 Orion Poplawski - 0.17.0-1 +- Update to 0.17.0 +- Drop ctypes patch applied upstream + * Thu Feb 04 2016 Fedora Release Engineering - 0.16.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index afa6a9f..c49c899 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -967cdb8588a4249f820344d8264a2143 scipy-0.16.1.tar.gz +5ff2971e1ce90e762c59d2cd84837224 scipy-0.17.0.tar.gz