From 88fb9c0b33de0a6ea1c70014de5dbb79f799e6de Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Jan 02 2014 05:03:01 +0000 Subject: - Update to 1.7.2 - Drop library-ext patch applied upstream --- diff --git a/.gitignore b/.gitignore index 0e6980e..7c50046 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ numpy-1.4.1.tar.gz /numpy-1.7.0rc1.tar.gz /numpy-1.7.0.tar.gz /numpy-1.7.1.tar.gz +/numpy-1.7.2.tar.gz diff --git a/fix-library-ext.patch b/fix-library-ext.patch deleted file mode 100644 index c4a3502..0000000 --- a/fix-library-ext.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py -index 7a38bed..5bd3a90 100644 ---- a/numpy/distutils/misc_util.py -+++ b/numpy/distutils/misc_util.py -@@ -605,11 +605,29 @@ def get_shared_lib_extension(is_python_ext=False): - Linux, but not on OS X. - - """ -- so_ext = distutils.sysconfig.get_config_var('SO') or '' -- # fix long extension for Python >=3.2, see PEP 3149. -- if (not is_python_ext) and 'SOABI' in distutils.sysconfig.get_config_vars(): -- # Does nothing unless SOABI config var exists -- so_ext = so_ext.replace('.' + distutils.sysconfig.get_config_var('SOABI'), '', 1) -+ confvars = distutils.sysconfig.get_config_vars() -+ # SO is deprecated in 3.3.1, use EXT_SUFFIX instead -+ so_ext = confvars.get('EXT_SUFFIX', None) -+ if so_ext is None: -+ so_ext = confvars.get('SO', '') -+ -+ if not is_python_ext: -+ # hardcode known values, config vars (including SHLIB_SUFFIX) are -+ # unreliable (see #3182) -+ # darwin, windows and debug linux are wrong in 3.3.1 and older -+ if (sys.platform.startswith('linux') or -+ sys.platform.startswith('gnukfreebsd')): -+ so_ext = '.so' -+ elif sys.platform.startswith('darwin'): -+ so_ext = '.dylib' -+ elif sys.platform.startswith('win'): -+ so_ext = '.dll' -+ else: -+ # fall back to config vars for unknown platforms -+ # fix long extension for Python >=3.2, see PEP 3149. -+ if 'SOABI' in confvars: -+ # Does nothing unless SOABI config var exists -+ so_ext = so_ext.replace('.' + confvars.get('SOABI'), '', 1) - - return so_ext - -diff --git a/numpy/distutils/tests/test_misc_util.py b/numpy/distutils/tests/test_misc_util.py -index 448800b..0f870d3 100644 ---- a/numpy/distutils/tests/test_misc_util.py -+++ b/numpy/distutils/tests/test_misc_util.py -@@ -1,7 +1,8 @@ - #!/usr/bin/env python - - from numpy.testing import * --from numpy.distutils.misc_util import appendpath, minrelpath, gpaths, rel_path -+from numpy.distutils.misc_util import appendpath, minrelpath, \ -+ gpaths, get_shared_lib_extension - from os.path import join, sep, dirname - - ajoin = lambda *paths: join(*((sep,)+paths)) -@@ -53,6 +54,21 @@ class TestGpaths(TestCase): - f = gpaths('system_info.py', local_path) - assert_(join(local_path,'system_info.py')==f[0],`f`) - -+class TestSharedExtension(TestCase): -+ -+ def test_get_shared_lib_extension(self): -+ import sys -+ ext = get_shared_lib_extension(is_python_ext=False) -+ if sys.platform.startswith('linux'): -+ assert_equal(ext, '.so') -+ elif sys.platform.startswith('gnukfreebsd'): -+ assert_equal(ext, '.so') -+ elif sys.platform.startswith('darwin'): -+ assert_equal(ext, '.dylib') -+ elif sys.platform.startswith('win'): -+ assert_equal(ext, '.dll') -+ # just check for no crash -+ assert_(get_shared_lib_extension(is_python_ext=True)) - - if __name__ == "__main__": - run_module_suite() diff --git a/numpy.spec b/numpy.spec index 86abe8d..ebeb0f7 100644 --- a/numpy.spec +++ b/numpy.spec @@ -8,7 +8,7 @@ #global relc rc1 Name: numpy -Version: 1.7.1 +Version: 1.7.2 Release: 7%{?dist} Epoch: 1 Summary: A fast multidimensional array facility for Python @@ -19,7 +19,6 @@ License: BSD and Python URL: http://www.numpy.org/ Source0: http://downloads.sourceforge.net/numpy/%{name}-%{version}%{?relc}.tar.gz Patch1: f2py-shebang.patch -Patch2: fix-library-ext.patch BuildRequires: python2-devel lapack-devel python-setuptools gcc-gfortran atlas-devel python-nose Requires: python-nose @@ -96,7 +95,6 @@ This package includes a version of f2py that works properly with NumPy. %prep %setup -q -n %{name}-%{version}%{?relc} %patch1 -p1 -%patch2 -p1 # workaround for rhbz#849713 # http://mail.scipy.org/pipermail/numpy-discussion/2012-July/063530.html rm numpy/distutils/command/__init__.py && touch numpy/distutils/command/__init__.py @@ -245,6 +243,10 @@ popd &> /dev/null %changelog +* Wed Jan 1 2014 Orion Poplawski - 1:1.7.2-1 +- Update to 1.7.2 +- Drop library-ext patch applied upstream + * Wed Nov 27 2013 Orion Poplawski - 1:1.7.1-7 - Build sphinx docs (bug #1034357) - Ship doc module (bug #1034357) diff --git a/sources b/sources index b38e986..c0b1ee4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ab72b3b83528a7ae79c6df9042d61c6 numpy-1.7.1.tar.gz +6eba32e71bd30cf70b9ea2ef28519d9a numpy-1.7.2.tar.gz