* [gentoo-commits] proj/musl:master commit in: dev-python/numpy/files/, dev-python/numpy/
@ 2016-01-03 16:51 Jory Pratt
0 siblings, 0 replies; 6+ messages in thread
From: Jory Pratt @ 2016-01-03 16:51 UTC (permalink / raw
To: gentoo-commits
commit: bd611864247f545397823f2b566f1361148bb2fd
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 3 16:43:11 2016 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Jan 3 16:43:11 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=bd611864
dev-python/numphy - Add support for musl
dev-python/numpy/Manifest | 9 ++
.../numpy/files/numpy-1.10.1-backport-1.patch | 127 +++++++++++++++++
.../numpy/files/numpy-1.10.1-backport-2.patch | 73 ++++++++++
dev-python/numpy/files/numpy-1.10.1-musl-fix.patch | 20 +++
.../numpy/files/numpy-1.9.2-no-hardcode-blas.patch | 35 +++++
dev-python/numpy/numpy-1.10.1-r1.ebuild | 156 +++++++++++++++++++++
6 files changed, 420 insertions(+)
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
new file mode 100644
index 0000000..68da0e0
--- /dev/null
+++ b/dev-python/numpy/Manifest
@@ -0,0 +1,9 @@
+AUX numpy-1.10.1-backport-1.patch 6086 SHA256 386920fcba91099aedfe0c8105aa53f10f596f62d300684d802397769ba9b1e1 SHA512 359076cdf1962744f1e0381d6e690422787307400db6ca51fb8f759f6af459666e9b4aad278bf4e89848fea5277204eab9459edb092fc2d9aa8dab14096eefe9 WHIRLPOOL e9bc09688dace432c9b112535415f0c60d97eb8b464da615368c031a9a7440ff9e39092ef9d020332b91e4af1203e2ae16a78176935df4d3e7b3617bd9235a12
+AUX numpy-1.10.1-backport-2.patch 2904 SHA256 ec6faad4e0105f3f291a43defed5c0f33ca669832589372a0b6ae92d9f5e4dd1 SHA512 8e1db75cd00209762b49f636549a4afccea1467f93b4ce94e02f3ada2f8be78a70fdfea51eb98a12690ef67b84734eb24d5a647def8022a4fddfc22cda4cb512 WHIRLPOOL f8fda61187660136537af662f85d7886272bc9f3bb0d05321f950a7ed6844acbfc8b5c64cd06764e8414adfce4d9d139af6f3bf9cd72330a8862160d2144eb2b
+AUX numpy-1.10.1-musl-fix.patch 543 SHA256 2d3f0358f9a5a33f783817964d1985f48eaffb5f239f494b9a57cab1c35565d7 SHA512 b832d756e2518471c117e72bba01c5b93859d694948f545f136a12cca69dc9f9a459539fce8fde740c0822c423572ec6aa9e805a28a6d9620df36b54c52b1d8f WHIRLPOOL 8708b667ce5d86ef5e7b468d5e059cf7d3ca572fff5e462f0f12f3855e0addd0dc9170390f720b90ccbb01c330c308124596d9808ad05f8ea8c0658de63e8284
+AUX numpy-1.9.2-no-hardcode-blas.patch 1821 SHA256 a51524eb39ed9f71667e89179fda3e16a974949629b9a0acb7a0994202a2db63 SHA512 59d498f7b0a1e6f4bc37e0eb7121812e1fe974e06176c7b80e99e41c49067a618bc98d925bcb667607462f5e7823f0f55235c8ddd685e318dfb3385b7eb7dad6 WHIRLPOOL 09e8cf5f27431fa7d5028b5d73690492e7da061f8ac5b82be1d1dbcc46c61c83cb6c5c3fb5f112bb61776075b98f7e1ef7b8a9fd828986f2c4b9358d9acb8d97
+DIST numpy-1.10.1.tar.gz 4048478 SHA256 8b9f453f29ce96a14e625100d3dcf8926301d36c5f622623bf8820e748510858 SHA512 ea717bac913a8e63bf93822bddbfe7701a3de00051bf3c7020f5e22756987becb5a2f96a6a52a36fc7c2b856815a782e450099688ce86b21fa94b0076b9ef376 WHIRLPOOL 7671368bec55c7f53ffa78a509946acc998e6f4223da4f3429b82a5a38b5e0277a0f89773ec2335f8e46b5c695620a4119af5ab59734184054c31b11841de44b
+DIST numpy-html-1.9.1.zip 9839137 SHA256 12a24937f8273fcf79090c99b6c4154a0ecfc378386498cf2afe727ea171407c SHA512 647a6be9f93995aca14185e283a2b412678c6e8080fe4f14e7cc9ee63c28eebb64dea6bbe28f30ef6850a5565dd1e06928fd660ac762e9a91454d309eff96ed4 WHIRLPOOL 68c367fd0416d27b1cf43edf7ca48bc8845c02856bbbacdf63c88fe8bbffd5dd86fb3e5cdea8f669dd78adf7bcc4d184953048783802df323126c1b22baf8e92
+DIST numpy-ref-1.9.1.pdf 5318122 SHA256 3c8e5881a3460e1cc9da95fe2167044e8f832ab8e980c3606d1f353e7ac6dcee SHA512 5171bb22588117a53e0eac355520581f7817a7e7a099ae83bb73f2ac8248a60e139ae9719dc543b44f25ccf8319c9f149fec1bf5aa55d943fad06a8e6da0d9ba WHIRLPOOL 5c99daf3ae2e6bf235aed287682f1b96d5b6afc9d290f544a8baab892b39c9f6dd9f649abe3e103cc90c990d87e4d653d8157d774a8bd35eccc9cc6ac7a870f9
+DIST numpy-user-1.9.1.pdf 418111 SHA256 e1f6baed0b73f3d4b106c88924c083f9a519e860c1beb718830bf1aee1892232 SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45 WHIRLPOOL f93ed20c5da7b379e3afcafab97c7eb60231ed4f73cebf18184e00b9a8a5a531fa32992f7f28f16d2714b3056c61153c29267c8c6b93cb100e06f53bced1bd6a
+EBUILD numpy-1.10.1-r1.ebuild 4293 SHA256 93ff64945e1813118fba4787b14924377c46092b6785d9ad7a3e0ba0d4567c66 SHA512 7c654383a424ab28df86e3f535acbf8833c41f244601fa34314878a0686ccaafca32379b73565ced19e47ce5d84b34c853118b21d9e15584e93647dfaca0c666 WHIRLPOOL 7082b39850bc873ad663f6cfeec46a1718e2d14a4eb22a4c0cfa0186605b94d740b1865c3e2dbf0203b993090bb18cd6ce5fc5ff046d915e95adf29f1444ab38
diff --git a/dev-python/numpy/files/numpy-1.10.1-backport-1.patch b/dev-python/numpy/files/numpy-1.10.1-backport-1.patch
new file mode 100644
index 0000000..77a3c01
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.10.1-backport-1.patch
@@ -0,0 +1,127 @@
+From 3a816a4db9b498eb64eb837fdcca0fa8ddbe063e Mon Sep 17 00:00:00 2001
+From: Allan Haldane <allan.haldane@gmail.com>
+Date: Sat, 17 Oct 2015 14:00:36 -0400
+Subject: [PATCH] BUG: recarrays viewed as subarrays don't convert to np.record
+ type
+
+Record array views were updated in #5943 to return np.record dtype
+where possible, but forgot about the case of sub-arrays.
+
+That's fixed here, so accessing subarray fields by attribute or index
+works sensibly, as well as viewing a record array as a subarray dtype,
+and printing subarrays.
+
+This also happens to fix #6459, since it affects the same lines.
+
+Fixes #6497 #6459
+---
+ numpy/core/records.py | 30 +++++++++++++++++++-----------
+ numpy/core/tests/test_records.py | 23 +++++++++++++++++++++++
+ 2 files changed, 42 insertions(+), 11 deletions(-)
+
+diff --git a/numpy/core/records.py b/numpy/core/records.py
+index 4a99553..4ce3fe9 100644
+--- a/numpy/core/records.py
++++ b/numpy/core/records.py
+@@ -448,12 +448,14 @@ def __getattribute__(self, attr):
+
+ # At this point obj will always be a recarray, since (see
+ # PyArray_GetField) the type of obj is inherited. Next, if obj.dtype is
+- # non-structured, convert it to an ndarray. If obj is structured leave
+- # it as a recarray, but make sure to convert to the same dtype.type (eg
+- # to preserve numpy.record type if present), since nested structured
+- # fields do not inherit type.
++ # non-structured, convert it to an ndarray. Then if obj is structured
++ # with void type convert it to the same dtype.type (eg to preserve
++ # numpy.record type if present), since nested structured fields do not
++ # inherit type. Don't do this for non-void structures though.
+ if obj.dtype.fields:
+- return obj.view(dtype=(self.dtype.type, obj.dtype.fields))
++ if issubclass(obj.dtype.type, nt.void):
++ return obj.view(dtype=(self.dtype.type, obj.dtype))
++ return obj
+ else:
+ return obj.view(ndarray)
+
+@@ -463,8 +465,9 @@ def __getattribute__(self, attr):
+ # Thus, you can't create attributes on-the-fly that are field names.
+ def __setattr__(self, attr, val):
+
+- # Automatically convert (void) dtypes to records.
+- if attr == 'dtype' and issubclass(val.type, nt.void):
++ # Automatically convert (void) structured types to records
++ # (but not non-void structures, subarrays, or non-structured voids)
++ if attr == 'dtype' and issubclass(val.type, nt.void) and val.fields:
+ val = sb.dtype((record, val))
+
+ newattr = attr not in self.__dict__
+@@ -499,7 +502,9 @@ def __getitem__(self, indx):
+ # we might also be returning a single element
+ if isinstance(obj, ndarray):
+ if obj.dtype.fields:
+- return obj.view(dtype=(self.dtype.type, obj.dtype.fields))
++ if issubclass(obj.dtype.type, nt.void):
++ return obj.view(dtype=(self.dtype.type, obj.dtype))
++ return obj
+ else:
+ return obj.view(type=ndarray)
+ else:
+@@ -519,11 +524,14 @@ def __repr__(self):
+ # If this is a full record array (has numpy.record dtype),
+ # or if it has a scalar (non-void) dtype with no records,
+ # represent it using the rec.array function. Since rec.array
+- # converts dtype to a numpy.record for us, use only dtype.descr,
+- # not repr(dtype).
++ # converts dtype to a numpy.record for us, convert back
++ # to non-record before printing
++ plain_dtype = self.dtype
++ if plain_dtype.type is record:
++ plain_dtype = sb.dtype((nt.void, plain_dtype))
+ lf = '\n'+' '*len("rec.array(")
+ return ('rec.array(%s, %sdtype=%s)' %
+- (lst, lf, repr(self.dtype.descr)))
++ (lst, lf, plain_dtype))
+ else:
+ # otherwise represent it using np.array plus a view
+ # This should only happen if the user is playing
+diff --git a/numpy/core/tests/test_records.py b/numpy/core/tests/test_records.py
+index 7a18f29..290bc4f 100644
+--- a/numpy/core/tests/test_records.py
++++ b/numpy/core/tests/test_records.py
+@@ -121,6 +121,23 @@ def test_recarray_views(self):
+ assert_equal(type(rv), np.recarray)
+ assert_equal(rv.dtype.type, np.record)
+
++ # check that accessing nested structures keep record type, but
++ # not for subarrays, non-void structures, non-structured voids
++ test_dtype = [('a', 'f4,f4'), ('b', 'V8'), ('c', ('f4',2)),
++ ('d', ('i8', 'i4,i4'))]
++ r = np.rec.array([((1,1), b'11111111', [1,1], 1),
++ ((1,1), b'11111111', [1,1], 1)], dtype=test_dtype)
++ assert_equal(r.a.dtype.type, np.record)
++ assert_equal(r.b.dtype.type, np.void)
++ assert_equal(r.c.dtype.type, np.float32)
++ assert_equal(r.d.dtype.type, np.int64)
++ # check the same, but for views
++ r = np.rec.array(np.ones(4, dtype='i4,i4'))
++ assert_equal(r.view('f4,f4').dtype.type, np.record)
++ assert_equal(r.view(('i4',2)).dtype.type, np.int32)
++ assert_equal(r.view('V8').dtype.type, np.void)
++ assert_equal(r.view(('i8', 'i4,i4')).dtype.type, np.int64)
++
+ #check that we can undo the view
+ arrs = [np.ones(4, dtype='f4,i4'), np.ones(4, dtype='f8')]
+ for arr in arrs:
+@@ -135,6 +152,12 @@ def test_recarray_repr(self):
+ a = np.array(np.ones(4, dtype='f8'))
+ assert_(repr(np.rec.array(a)).startswith('rec.array'))
+
++ # check that the 'np.record' part of the dtype isn't shown
++ a = np.rec.array(np.ones(3, dtype='i4,i4'))
++ assert_equal(repr(a).find('numpy.record'), -1)
++ a = np.rec.array(np.ones(3, dtype='i4'))
++ assert_(repr(a).find('dtype=int32') != -1)
++
+ def test_recarray_from_names(self):
+ ra = np.rec.array([
+ (1, 'abc', 3.7000002861022949, 0),
diff --git a/dev-python/numpy/files/numpy-1.10.1-backport-2.patch b/dev-python/numpy/files/numpy-1.10.1-backport-2.patch
new file mode 100644
index 0000000..9c33704
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.10.1-backport-2.patch
@@ -0,0 +1,73 @@
+From 0d25dc4175e00cdaf9545e8b1b1a5b879cf67248 Mon Sep 17 00:00:00 2001
+From: Ethan Kruse <eakruse@uw.edu>
+Date: Mon, 19 Oct 2015 13:29:01 -0700
+Subject: [PATCH 1/2] Potential fix for #6462
+
+---
+ numpy/lib/function_base.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
+index 555d083..fef69df 100644
+--- a/numpy/lib/function_base.py
++++ b/numpy/lib/function_base.py
+@@ -3339,7 +3339,7 @@ def _median(a, axis=None, out=None, overwrite_input=False):
+ indexer[axis] = slice(index-1, index+1)
+
+ # Check if the array contains any nan's
+- if np.issubdtype(a.dtype, np.inexact):
++ if np.issubdtype(a.dtype, np.inexact) and sz > 0:
+ # warn and return nans like mean would
+ rout = mean(part[indexer], axis=axis, out=out)
+ part = np.rollaxis(part, axis, part.ndim)
+
+From 59d859fb2160950ac93267d7461ad952145c8724 Mon Sep 17 00:00:00 2001
+From: Ethan Kruse <eakruse@uw.edu>
+Date: Tue, 20 Oct 2015 11:40:49 -0700
+Subject: [PATCH 2/2] Added tests for median of empty arrays
+
+---
+ numpy/lib/tests/test_function_base.py | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py
+index 4516c92..aa41c1f 100644
+--- a/numpy/lib/tests/test_function_base.py
++++ b/numpy/lib/tests/test_function_base.py
+@@ -2597,6 +2597,36 @@ def test_nan_behavior(self):
+ assert_equal(np.median(a, (0, 2)), b)
+ assert_equal(len(w), 1)
+
++ def test_empty(self):
++ # empty arrays
++ a = np.array([], dtype=float)
++ with warnings.catch_warnings(record=True) as w:
++ warnings.filterwarnings('always', '', RuntimeWarning)
++ assert_equal(np.median(a), np.nan)
++ assert_(w[0].category is RuntimeWarning)
++
++ # multiple dimensions
++ a = np.array([], dtype=float, ndmin=3)
++ # no axis
++ with warnings.catch_warnings(record=True) as w:
++ warnings.filterwarnings('always', '', RuntimeWarning)
++ assert_equal(np.median(a), np.nan)
++ assert_(w[0].category is RuntimeWarning)
++
++ # axis 0 and 1
++ b = np.array([], dtype=float, ndmin=2)
++ with warnings.catch_warnings(record=True) as w:
++ warnings.filterwarnings('always', '', RuntimeWarning)
++ assert_equal(np.median(a, axis=0), b)
++ assert_equal(np.median(a, axis=1), b)
++
++ # axis 2
++ b = np.array(np.nan, dtype=float, ndmin=2)
++ with warnings.catch_warnings(record=True) as w:
++ warnings.filterwarnings('always', '', RuntimeWarning)
++ assert_equal(np.median(a, axis=2), b)
++ assert_(w[0].category is RuntimeWarning)
++
+ def test_object(self):
+ o = np.arange(7.)
+ assert_(type(np.median(o.astype(object))), float)
diff --git a/dev-python/numpy/files/numpy-1.10.1-musl-fix.patch b/dev-python/numpy/files/numpy-1.10.1-musl-fix.patch
new file mode 100644
index 0000000..b5b891c
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.10.1-musl-fix.patch
@@ -0,0 +1,20 @@
+--- a/numpy/core/src/private/npy_config.h.orig 2015-08-11 19:03:43.000000000 +0200
++++ b/numpy/core/src/private/npy_config.h 2015-10-08 08:20:25.489203036 +0200
+@@ -71,7 +71,7 @@
+
+
+ /* Disable broken gnu trig functions on linux */
+-#if defined(__linux__) && defined(__GNUC__)
++#if defined(__linux__) && defined(__GLIBC__)
+
+ #if defined(HAVE_FEATURES_H)
+ #include <features.h>
+@@ -96,6 +96,6 @@
+ #endif
+ #undef TRIG_OK
+
+-#endif /* defined(__linux__) && defined(__GNUC__) */
++#endif /* defined(__linux__) && defined(__GLIBC__) */
+
+ #endif
+
diff --git a/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch
new file mode 100644
index 0000000..674dbfa
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch
@@ -0,0 +1,35 @@
+ numpy/distutils/system_info.py | 21 +--------------------
+ 1 file changed, 1 insertion(+), 20 deletions(-)
+
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
+index a050430..d0878a5 100644
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -303,26 +303,7 @@ def get_info(name, notfound_action=0):
+ 1 - display warning message
+ 2 - raise error
+ """
+- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead
+- 'atlas_threads': atlas_threads_info, # ditto
+- 'atlas_blas': atlas_blas_info,
+- 'atlas_blas_threads': atlas_blas_threads_info,
+- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead
+- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto
+- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead
+- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto
+- 'atlas_3_10_blas': atlas_3_10_blas_info,
+- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
+- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead
+- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto
+- 'mkl': mkl_info,
+- # openblas which may or may not have embedded lapack
+- 'openblas': openblas_info, # use blas_opt instead
+- # openblas with embedded lapack
+- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead
+- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead
+- 'blas_mkl': blas_mkl_info, # use blas_opt instead
+- 'x11': x11_info,
++ cl = {'x11': x11_info,
+ 'fft_opt': fft_opt_info,
+ 'fftw': fftw_info,
+ 'fftw2': fftw2_info,
diff --git a/dev-python/numpy/numpy-1.10.1-r1.ebuild b/dev-python/numpy/numpy-1.10.1-r1.ebuild
new file mode 100644
index 0000000..ab6df8b
--- /dev/null
+++ b/dev-python/numpy/numpy-1.10.1-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
+
+DOC_PV="1.9.1"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://www.numpy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+ doc? (
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+ )"
+# It appears the docs haven't been upgraded, still @ 1.8.1
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+ doc? ( app-arch/unzip )
+ lapack? ( virtual/pkgconfig )
+ test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
+ "${FILESDIR}"/${PN}-1.10.1-musl-fix.patch
+ "${FILESDIR}"/${P}-backport-1.patch
+ "${FILESDIR}"/${P}-backport-2.patch
+)
+
+src_unpack() {
+ default
+ if use doc; then
+ unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+ fi
+}
+
+pc_incdir() {
+ $(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+ sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+ $(tc-getPKG_CONFIG) --libs-only-L $@ | \
+ sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+ $(tc-getPKG_CONFIG) --libs-only-l $@ | \
+ sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+ -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+ | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+ if use lapack; then
+ append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+ local libdir="${EPREFIX}"/usr/$(get_libdir)
+ # make sure _dotblas.so gets built
+ sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
+ cat >> site.cfg <<-EOF
+ [blas]
+ include_dirs = $(pc_incdir cblas)
+ library_dirs = $(pc_libdir cblas blas):${libdir}
+ blas_libs = $(pc_libs cblas blas)
+ [lapack]
+ library_dirs = $(pc_libdir lapack):${libdir}
+ lapack_libs = $(pc_libs lapack)
+ EOF
+ else
+ export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+ fi
+
+ export CC="$(tc-getCC) ${CFLAGS}"
+
+ append-flags -fno-strict-aliasing
+
+ # See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+ # with the subtle difference that we don't want to break Darwin where
+ # -shared is not a valid linker argument
+ if [[ ${CHOST} != *-darwin* ]]; then
+ append-ldflags -shared
+ fi
+
+ # only one fortran to link with:
+ # linking with cblas and lapack library will force
+ # autodetecting and linking to all available fortran compilers
+ append-fflags -fPIC
+ if use lapack; then
+ NUMPY_FCONFIG="config_fc --noopt --noarch"
+ # workaround bug 335908
+ [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+ fi
+
+ # don't version f2py, we will handle it.
+ sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+
+ # we don't have f2py-3.3
+ sed \
+ -e "/f2py_cmd/s:'f2py'.*:'f2py':g" \
+ -i numpy/tests/test_scripts.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
+}
+
+python_test() {
+ distutils_install_for_testing ${NUMPY_FCONFIG}
+
+ cd "${TMPDIR}" || die
+ ${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+
+ if use doc; then
+ dohtml -r "${WORKDIR}"/html/*
+ dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+ fi
+
+ # absent in 1.9
+ #docinto f2py
+ #dodoc numpy/f2py/docs/*.txt
+ #doman numpy/f2py/f2py.1
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-python/numpy/files/, dev-python/numpy/
@ 2016-02-03 5:14 Anthony G. Basile
0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2016-02-03 5:14 UTC (permalink / raw
To: gentoo-commits
commit: a739074affb67ea39f3d93d1230ce85ac55e619b
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 3 05:23:41 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Feb 3 05:23:41 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a739074a
dev-python/numpy: bump to 1.10.4
Package-Manager: portage-2.2.26
RepoMan-Options: --force
dev-python/numpy/Manifest | 14 +--
.../numpy/files/numpy-1.10.1-backport-1.patch | 127 ---------------------
.../numpy/files/numpy-1.10.1-backport-2.patch | 73 ------------
.../files/numpy-1.10.2-no-hardcode-blas.patch | 64 +++++++++++
.../numpy/files/numpy-1.9.2-no-hardcode-blas.patch | 35 ------
...py-1.10.1-r1.ebuild => numpy-1.10.4-r99.ebuild} | 41 +++----
6 files changed, 89 insertions(+), 265 deletions(-)
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 68da0e0..80311de 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,9 +1,7 @@
-AUX numpy-1.10.1-backport-1.patch 6086 SHA256 386920fcba91099aedfe0c8105aa53f10f596f62d300684d802397769ba9b1e1 SHA512 359076cdf1962744f1e0381d6e690422787307400db6ca51fb8f759f6af459666e9b4aad278bf4e89848fea5277204eab9459edb092fc2d9aa8dab14096eefe9 WHIRLPOOL e9bc09688dace432c9b112535415f0c60d97eb8b464da615368c031a9a7440ff9e39092ef9d020332b91e4af1203e2ae16a78176935df4d3e7b3617bd9235a12
-AUX numpy-1.10.1-backport-2.patch 2904 SHA256 ec6faad4e0105f3f291a43defed5c0f33ca669832589372a0b6ae92d9f5e4dd1 SHA512 8e1db75cd00209762b49f636549a4afccea1467f93b4ce94e02f3ada2f8be78a70fdfea51eb98a12690ef67b84734eb24d5a647def8022a4fddfc22cda4cb512 WHIRLPOOL f8fda61187660136537af662f85d7886272bc9f3bb0d05321f950a7ed6844acbfc8b5c64cd06764e8414adfce4d9d139af6f3bf9cd72330a8862160d2144eb2b
AUX numpy-1.10.1-musl-fix.patch 543 SHA256 2d3f0358f9a5a33f783817964d1985f48eaffb5f239f494b9a57cab1c35565d7 SHA512 b832d756e2518471c117e72bba01c5b93859d694948f545f136a12cca69dc9f9a459539fce8fde740c0822c423572ec6aa9e805a28a6d9620df36b54c52b1d8f WHIRLPOOL 8708b667ce5d86ef5e7b468d5e059cf7d3ca572fff5e462f0f12f3855e0addd0dc9170390f720b90ccbb01c330c308124596d9808ad05f8ea8c0658de63e8284
-AUX numpy-1.9.2-no-hardcode-blas.patch 1821 SHA256 a51524eb39ed9f71667e89179fda3e16a974949629b9a0acb7a0994202a2db63 SHA512 59d498f7b0a1e6f4bc37e0eb7121812e1fe974e06176c7b80e99e41c49067a618bc98d925bcb667607462f5e7823f0f55235c8ddd685e318dfb3385b7eb7dad6 WHIRLPOOL 09e8cf5f27431fa7d5028b5d73690492e7da061f8ac5b82be1d1dbcc46c61c83cb6c5c3fb5f112bb61776075b98f7e1ef7b8a9fd828986f2c4b9358d9acb8d97
-DIST numpy-1.10.1.tar.gz 4048478 SHA256 8b9f453f29ce96a14e625100d3dcf8926301d36c5f622623bf8820e748510858 SHA512 ea717bac913a8e63bf93822bddbfe7701a3de00051bf3c7020f5e22756987becb5a2f96a6a52a36fc7c2b856815a782e450099688ce86b21fa94b0076b9ef376 WHIRLPOOL 7671368bec55c7f53ffa78a509946acc998e6f4223da4f3429b82a5a38b5e0277a0f89773ec2335f8e46b5c695620a4119af5ab59734184054c31b11841de44b
-DIST numpy-html-1.9.1.zip 9839137 SHA256 12a24937f8273fcf79090c99b6c4154a0ecfc378386498cf2afe727ea171407c SHA512 647a6be9f93995aca14185e283a2b412678c6e8080fe4f14e7cc9ee63c28eebb64dea6bbe28f30ef6850a5565dd1e06928fd660ac762e9a91454d309eff96ed4 WHIRLPOOL 68c367fd0416d27b1cf43edf7ca48bc8845c02856bbbacdf63c88fe8bbffd5dd86fb3e5cdea8f669dd78adf7bcc4d184953048783802df323126c1b22baf8e92
-DIST numpy-ref-1.9.1.pdf 5318122 SHA256 3c8e5881a3460e1cc9da95fe2167044e8f832ab8e980c3606d1f353e7ac6dcee SHA512 5171bb22588117a53e0eac355520581f7817a7e7a099ae83bb73f2ac8248a60e139ae9719dc543b44f25ccf8319c9f149fec1bf5aa55d943fad06a8e6da0d9ba WHIRLPOOL 5c99daf3ae2e6bf235aed287682f1b96d5b6afc9d290f544a8baab892b39c9f6dd9f649abe3e103cc90c990d87e4d653d8157d774a8bd35eccc9cc6ac7a870f9
-DIST numpy-user-1.9.1.pdf 418111 SHA256 e1f6baed0b73f3d4b106c88924c083f9a519e860c1beb718830bf1aee1892232 SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45 WHIRLPOOL f93ed20c5da7b379e3afcafab97c7eb60231ed4f73cebf18184e00b9a8a5a531fa32992f7f28f16d2714b3056c61153c29267c8c6b93cb100e06f53bced1bd6a
-EBUILD numpy-1.10.1-r1.ebuild 4293 SHA256 93ff64945e1813118fba4787b14924377c46092b6785d9ad7a3e0ba0d4567c66 SHA512 7c654383a424ab28df86e3f535acbf8833c41f244601fa34314878a0686ccaafca32379b73565ced19e47ce5d84b34c853118b21d9e15584e93647dfaca0c666 WHIRLPOOL 7082b39850bc873ad663f6cfeec46a1718e2d14a4eb22a4c0cfa0186605b94d740b1865c3e2dbf0203b993090bb18cd6ce5fc5ff046d915e95adf29f1444ab38
+AUX numpy-1.10.2-no-hardcode-blas.patch 3295 SHA256 fb1ac68398a9c4fbf2396083e85480d46077d7b29069d8b62c4a929ab48216d1 SHA512 456f3b7016d12fea49c8db08cec81e207575a28018490c5b2eece8b4167e22dd93a5811d90f43435a0341ecb3a3cbc6c2fd804869ba9d96b7b2382736805aadd WHIRLPOOL 2a34f1f6f6a3a37a67b7cb1419b0aca7891ab9375cb5489f4ac974e71dff9f6e9442d0b3414437bf3010f271d7782b89b111ef34dcee1530c39e43bebe1a7b08
+DIST numpy-1.10.4.tar.gz 4069996 SHA256 7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 WHIRLPOOL 76946c2543b1cade06d71f83fd507bd818c1090baa9c3ddda7d1f48d48ed23672c5d9de76db890df990c6d8b7b26b71d3ce733c448943ad4177374a957360d1c
+DIST numpy-html-1.10.1.zip 9663942 SHA256 4af48eb5abf2551f01d85aea7e9a99a30096777f02937dc185b16bb72a110366 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9 WHIRLPOOL d6c93e31e31c832fb21f117d03719e0375ee3d27fb6f7975bfcd12469df4a2ed0a25a16bd09a0e2113407446efc220e5bff534f7cd76a715c3d7df26c02f07a1
+DIST numpy-ref-1.10.1.pdf 5382006 SHA256 72ae03348d0375ff2f18056efd04e815cc1d27b738d0685c80f5204a496bc279 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c WHIRLPOOL d904d9b2824bfb08a0eeffeb37f7d646d003c39230d950d387e2ddc8e475a117b8305a0ce3dc479be72f010b1a868f22ddfde17e6c4cd7c56630bbdf09afb90e
+DIST numpy-user-1.10.1.pdf 406114 SHA256 5180a5a1333365e474aabba9d6edd25276e79179fd708bb3989d95dc4e76215f SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4 WHIRLPOOL 4b53256663840738d288d38c4151e01ecfb515ebd4f69bb4330f4c5589642b3392a0a300f3def53df6bee8746f127a3af0d284601f288f4c4292df8b6de39f71
+EBUILD numpy-1.10.4-r99.ebuild 3933 SHA256 3dc5a293dc7b327de33b254bb4b465a04c483b7fcbfc85ae5f716be9e7f7be69 SHA512 a6a2b980fb02c356ad9c7baede082bfb12c43044c19009ab2f6026e87b8490cb78ba90919ad22d55ee0ec3478ed0d774d2436852c810ad91040fddf011780949 WHIRLPOOL d61cffe8da7124401c17fc4f5202d7415290fd3976162dfdf964ff26b56042e113729a455b8930eee7c2e156dd128235bb3a628f2496af7268ca4adc69600288
diff --git a/dev-python/numpy/files/numpy-1.10.1-backport-1.patch b/dev-python/numpy/files/numpy-1.10.1-backport-1.patch
deleted file mode 100644
index 77a3c01..0000000
--- a/dev-python/numpy/files/numpy-1.10.1-backport-1.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 3a816a4db9b498eb64eb837fdcca0fa8ddbe063e Mon Sep 17 00:00:00 2001
-From: Allan Haldane <allan.haldane@gmail.com>
-Date: Sat, 17 Oct 2015 14:00:36 -0400
-Subject: [PATCH] BUG: recarrays viewed as subarrays don't convert to np.record
- type
-
-Record array views were updated in #5943 to return np.record dtype
-where possible, but forgot about the case of sub-arrays.
-
-That's fixed here, so accessing subarray fields by attribute or index
-works sensibly, as well as viewing a record array as a subarray dtype,
-and printing subarrays.
-
-This also happens to fix #6459, since it affects the same lines.
-
-Fixes #6497 #6459
----
- numpy/core/records.py | 30 +++++++++++++++++++-----------
- numpy/core/tests/test_records.py | 23 +++++++++++++++++++++++
- 2 files changed, 42 insertions(+), 11 deletions(-)
-
-diff --git a/numpy/core/records.py b/numpy/core/records.py
-index 4a99553..4ce3fe9 100644
---- a/numpy/core/records.py
-+++ b/numpy/core/records.py
-@@ -448,12 +448,14 @@ def __getattribute__(self, attr):
-
- # At this point obj will always be a recarray, since (see
- # PyArray_GetField) the type of obj is inherited. Next, if obj.dtype is
-- # non-structured, convert it to an ndarray. If obj is structured leave
-- # it as a recarray, but make sure to convert to the same dtype.type (eg
-- # to preserve numpy.record type if present), since nested structured
-- # fields do not inherit type.
-+ # non-structured, convert it to an ndarray. Then if obj is structured
-+ # with void type convert it to the same dtype.type (eg to preserve
-+ # numpy.record type if present), since nested structured fields do not
-+ # inherit type. Don't do this for non-void structures though.
- if obj.dtype.fields:
-- return obj.view(dtype=(self.dtype.type, obj.dtype.fields))
-+ if issubclass(obj.dtype.type, nt.void):
-+ return obj.view(dtype=(self.dtype.type, obj.dtype))
-+ return obj
- else:
- return obj.view(ndarray)
-
-@@ -463,8 +465,9 @@ def __getattribute__(self, attr):
- # Thus, you can't create attributes on-the-fly that are field names.
- def __setattr__(self, attr, val):
-
-- # Automatically convert (void) dtypes to records.
-- if attr == 'dtype' and issubclass(val.type, nt.void):
-+ # Automatically convert (void) structured types to records
-+ # (but not non-void structures, subarrays, or non-structured voids)
-+ if attr == 'dtype' and issubclass(val.type, nt.void) and val.fields:
- val = sb.dtype((record, val))
-
- newattr = attr not in self.__dict__
-@@ -499,7 +502,9 @@ def __getitem__(self, indx):
- # we might also be returning a single element
- if isinstance(obj, ndarray):
- if obj.dtype.fields:
-- return obj.view(dtype=(self.dtype.type, obj.dtype.fields))
-+ if issubclass(obj.dtype.type, nt.void):
-+ return obj.view(dtype=(self.dtype.type, obj.dtype))
-+ return obj
- else:
- return obj.view(type=ndarray)
- else:
-@@ -519,11 +524,14 @@ def __repr__(self):
- # If this is a full record array (has numpy.record dtype),
- # or if it has a scalar (non-void) dtype with no records,
- # represent it using the rec.array function. Since rec.array
-- # converts dtype to a numpy.record for us, use only dtype.descr,
-- # not repr(dtype).
-+ # converts dtype to a numpy.record for us, convert back
-+ # to non-record before printing
-+ plain_dtype = self.dtype
-+ if plain_dtype.type is record:
-+ plain_dtype = sb.dtype((nt.void, plain_dtype))
- lf = '\n'+' '*len("rec.array(")
- return ('rec.array(%s, %sdtype=%s)' %
-- (lst, lf, repr(self.dtype.descr)))
-+ (lst, lf, plain_dtype))
- else:
- # otherwise represent it using np.array plus a view
- # This should only happen if the user is playing
-diff --git a/numpy/core/tests/test_records.py b/numpy/core/tests/test_records.py
-index 7a18f29..290bc4f 100644
---- a/numpy/core/tests/test_records.py
-+++ b/numpy/core/tests/test_records.py
-@@ -121,6 +121,23 @@ def test_recarray_views(self):
- assert_equal(type(rv), np.recarray)
- assert_equal(rv.dtype.type, np.record)
-
-+ # check that accessing nested structures keep record type, but
-+ # not for subarrays, non-void structures, non-structured voids
-+ test_dtype = [('a', 'f4,f4'), ('b', 'V8'), ('c', ('f4',2)),
-+ ('d', ('i8', 'i4,i4'))]
-+ r = np.rec.array([((1,1), b'11111111', [1,1], 1),
-+ ((1,1), b'11111111', [1,1], 1)], dtype=test_dtype)
-+ assert_equal(r.a.dtype.type, np.record)
-+ assert_equal(r.b.dtype.type, np.void)
-+ assert_equal(r.c.dtype.type, np.float32)
-+ assert_equal(r.d.dtype.type, np.int64)
-+ # check the same, but for views
-+ r = np.rec.array(np.ones(4, dtype='i4,i4'))
-+ assert_equal(r.view('f4,f4').dtype.type, np.record)
-+ assert_equal(r.view(('i4',2)).dtype.type, np.int32)
-+ assert_equal(r.view('V8').dtype.type, np.void)
-+ assert_equal(r.view(('i8', 'i4,i4')).dtype.type, np.int64)
-+
- #check that we can undo the view
- arrs = [np.ones(4, dtype='f4,i4'), np.ones(4, dtype='f8')]
- for arr in arrs:
-@@ -135,6 +152,12 @@ def test_recarray_repr(self):
- a = np.array(np.ones(4, dtype='f8'))
- assert_(repr(np.rec.array(a)).startswith('rec.array'))
-
-+ # check that the 'np.record' part of the dtype isn't shown
-+ a = np.rec.array(np.ones(3, dtype='i4,i4'))
-+ assert_equal(repr(a).find('numpy.record'), -1)
-+ a = np.rec.array(np.ones(3, dtype='i4'))
-+ assert_(repr(a).find('dtype=int32') != -1)
-+
- def test_recarray_from_names(self):
- ra = np.rec.array([
- (1, 'abc', 3.7000002861022949, 0),
diff --git a/dev-python/numpy/files/numpy-1.10.1-backport-2.patch b/dev-python/numpy/files/numpy-1.10.1-backport-2.patch
deleted file mode 100644
index 9c33704..0000000
--- a/dev-python/numpy/files/numpy-1.10.1-backport-2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 0d25dc4175e00cdaf9545e8b1b1a5b879cf67248 Mon Sep 17 00:00:00 2001
-From: Ethan Kruse <eakruse@uw.edu>
-Date: Mon, 19 Oct 2015 13:29:01 -0700
-Subject: [PATCH 1/2] Potential fix for #6462
-
----
- numpy/lib/function_base.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
-index 555d083..fef69df 100644
---- a/numpy/lib/function_base.py
-+++ b/numpy/lib/function_base.py
-@@ -3339,7 +3339,7 @@ def _median(a, axis=None, out=None, overwrite_input=False):
- indexer[axis] = slice(index-1, index+1)
-
- # Check if the array contains any nan's
-- if np.issubdtype(a.dtype, np.inexact):
-+ if np.issubdtype(a.dtype, np.inexact) and sz > 0:
- # warn and return nans like mean would
- rout = mean(part[indexer], axis=axis, out=out)
- part = np.rollaxis(part, axis, part.ndim)
-
-From 59d859fb2160950ac93267d7461ad952145c8724 Mon Sep 17 00:00:00 2001
-From: Ethan Kruse <eakruse@uw.edu>
-Date: Tue, 20 Oct 2015 11:40:49 -0700
-Subject: [PATCH 2/2] Added tests for median of empty arrays
-
----
- numpy/lib/tests/test_function_base.py | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
-diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py
-index 4516c92..aa41c1f 100644
---- a/numpy/lib/tests/test_function_base.py
-+++ b/numpy/lib/tests/test_function_base.py
-@@ -2597,6 +2597,36 @@ def test_nan_behavior(self):
- assert_equal(np.median(a, (0, 2)), b)
- assert_equal(len(w), 1)
-
-+ def test_empty(self):
-+ # empty arrays
-+ a = np.array([], dtype=float)
-+ with warnings.catch_warnings(record=True) as w:
-+ warnings.filterwarnings('always', '', RuntimeWarning)
-+ assert_equal(np.median(a), np.nan)
-+ assert_(w[0].category is RuntimeWarning)
-+
-+ # multiple dimensions
-+ a = np.array([], dtype=float, ndmin=3)
-+ # no axis
-+ with warnings.catch_warnings(record=True) as w:
-+ warnings.filterwarnings('always', '', RuntimeWarning)
-+ assert_equal(np.median(a), np.nan)
-+ assert_(w[0].category is RuntimeWarning)
-+
-+ # axis 0 and 1
-+ b = np.array([], dtype=float, ndmin=2)
-+ with warnings.catch_warnings(record=True) as w:
-+ warnings.filterwarnings('always', '', RuntimeWarning)
-+ assert_equal(np.median(a, axis=0), b)
-+ assert_equal(np.median(a, axis=1), b)
-+
-+ # axis 2
-+ b = np.array(np.nan, dtype=float, ndmin=2)
-+ with warnings.catch_warnings(record=True) as w:
-+ warnings.filterwarnings('always', '', RuntimeWarning)
-+ assert_equal(np.median(a, axis=2), b)
-+ assert_(w[0].category is RuntimeWarning)
-+
- def test_object(self):
- o = np.arange(7.)
- assert_(type(np.median(o.astype(object))), float)
diff --git a/dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch
new file mode 100644
index 0000000..db4a47d
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.10.2-no-hardcode-blas.patch
@@ -0,0 +1,64 @@
+ numpy/distutils/system_info.py | 29 +++++------------------------
+ 1 file changed, 5 insertions(+), 24 deletions(-)
+
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
+index d7eb49e..aa62b09 100644
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -306,26 +306,7 @@ def get_info(name, notfound_action=0):
+ 1 - display warning message
+ 2 - raise error
+ """
+- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead
+- 'atlas_threads': atlas_threads_info, # ditto
+- 'atlas_blas': atlas_blas_info,
+- 'atlas_blas_threads': atlas_blas_threads_info,
+- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead
+- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto
+- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead
+- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto
+- 'atlas_3_10_blas': atlas_3_10_blas_info,
+- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
+- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead
+- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto
+- 'mkl': mkl_info,
+- # openblas which may or may not have embedded lapack
+- 'openblas': openblas_info, # use blas_opt instead
+- # openblas with embedded lapack
+- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead
+- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead
+- 'blas_mkl': blas_mkl_info, # use blas_opt instead
+- 'x11': x11_info,
++ cl = {'x11': x11_info,
+ 'fft_opt': fft_opt_info,
+ 'fftw': fftw_info,
+ 'fftw2': fftw2_info,
+@@ -1690,7 +1671,7 @@ class blas_info(system_info):
+ lib = self.has_cblas(info)
+ if lib is not None:
+ info['language'] = 'c'
+- info['libraries'] = [lib]
++ info['libraries'] = lib
+ info['define_macros'] = [('HAVE_CBLAS', None)]
+ self.set_info(**info)
+
+@@ -1722,16 +1703,16 @@ class blas_info(system_info):
+ # check for cblas lib, and if not present check for blas lib.
+ try:
+ c.link_executable(obj, os.path.join(tmpdir, "a.out"),
+- libraries=["cblas"],
++ libraries=info["libraries"],
+ library_dirs=info['library_dirs'],
+ extra_postargs=info.get('extra_link_args', []))
+- res = "cblas"
++ res = info["libraries"]
+ except distutils.ccompiler.LinkError:
+ c.link_executable(obj, os.path.join(tmpdir, "a.out"),
+ libraries=["blas"],
+ library_dirs=info['library_dirs'],
+ extra_postargs=info.get('extra_link_args', []))
+- res = "blas"
++ res = ["blas"]
+ except distutils.ccompiler.CompileError:
+ res = None
+ finally:
diff --git a/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch
deleted file mode 100644
index 674dbfa..0000000
--- a/dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch
+++ /dev/null
@@ -1,35 +0,0 @@
- numpy/distutils/system_info.py | 21 +--------------------
- 1 file changed, 1 insertion(+), 20 deletions(-)
-
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index a050430..d0878a5 100644
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -303,26 +303,7 @@ def get_info(name, notfound_action=0):
- 1 - display warning message
- 2 - raise error
- """
-- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead
-- 'atlas_threads': atlas_threads_info, # ditto
-- 'atlas_blas': atlas_blas_info,
-- 'atlas_blas_threads': atlas_blas_threads_info,
-- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead
-- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto
-- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead
-- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto
-- 'atlas_3_10_blas': atlas_3_10_blas_info,
-- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
-- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead
-- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto
-- 'mkl': mkl_info,
-- # openblas which may or may not have embedded lapack
-- 'openblas': openblas_info, # use blas_opt instead
-- # openblas with embedded lapack
-- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead
-- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead
-- 'blas_mkl': blas_mkl_info, # use blas_opt instead
-- 'x11': x11_info,
-+ cl = {'x11': x11_info,
- 'fft_opt': fft_opt_info,
- 'fftw': fftw_info,
- 'fftw2': fftw2_info,
diff --git a/dev-python/numpy/numpy-1.10.1-r1.ebuild b/dev-python/numpy/numpy-1.10.4-r99.ebuild
similarity index 77%
rename from dev-python/numpy/numpy-1.10.1-r1.ebuild
rename to dev-python/numpy/numpy-1.10.4-r99.ebuild
index ab6df8b..d2a05ce 100644
--- a/dev-python/numpy/numpy-1.10.1-r1.ebuild
+++ b/dev-python/numpy/numpy-1.10.4-r99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@ FORTRAN_NEEDED=lapack
inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
-DOC_PV="1.9.1"
+DOC_PV="1.10.1"
DOC_P="${PN}-${DOC_PV}"
DESCRIPTION="Fast array and numerical python library"
@@ -25,7 +25,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
# It appears the docs haven't been upgraded, still @ 1.8.1
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~mips ppc x86"
IUSE="doc lapack test"
RDEPEND="
@@ -40,10 +40,8 @@ DEPEND="${RDEPEND}
DISTUTILS_IN_SOURCE_BUILD=1
PATCHES=(
- "${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
+ "${FILESDIR}"/${PN}-1.10.2-no-hardcode-blas.patch
"${FILESDIR}"/${PN}-1.10.1-musl-fix.patch
- "${FILESDIR}"/${P}-backport-1.patch
- "${FILESDIR}"/${P}-backport-2.patch
)
src_unpack() {
@@ -74,8 +72,6 @@ python_prepare_all() {
if use lapack; then
append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
local libdir="${EPREFIX}"/usr/$(get_libdir)
- # make sure _dotblas.so gets built
- sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
cat >> site.cfg <<-EOF
[blas]
include_dirs = $(pc_incdir cblas)
@@ -111,18 +107,20 @@ python_prepare_all() {
fi
# don't version f2py, we will handle it.
- sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+ sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
# we don't have f2py-3.3
- sed \
- -e "/f2py_cmd/s:'f2py'.*:'f2py':g" \
- -i numpy/tests/test_scripts.py || die
+# sed \
+# -e 's:test_f2py:_&:g' \
+# -i numpy/tests/test_scripts.py || die
distutils-r1_python_prepare_all
}
python_compile() {
- distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
+ distutils-r1_python_compile \
+ $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
+ ${NUMPY_FCONFIG}
}
python_test() {
@@ -140,17 +138,16 @@ python_install() {
}
python_install_all() {
- distutils-r1_python_install_all
-
- dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+ DOCS+=( COMPATIBILITY DEV_README.txt THANKS.txt )
if use doc; then
- dohtml -r "${WORKDIR}"/html/*
- dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+ HTML_DOCS=( "${WORKDIR}"/html/. )
+ DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
fi
- # absent in 1.9
- #docinto f2py
- #dodoc numpy/f2py/docs/*.txt
- #doman numpy/f2py/f2py.1
+ distutils-r1_python_install_all
+
+ docinto f2py
+ dodoc doc/f2py/*.txt
+ doman doc/f2py/f2py.1
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-python/numpy/files/, dev-python/numpy/
@ 2016-11-09 4:22 Aric Belsito
0 siblings, 0 replies; 6+ messages in thread
From: Aric Belsito @ 2016-11-09 4:22 UTC (permalink / raw
To: gentoo-commits
commit: fd7e689d2375e80cf584c9eb39f7a6f3e3bda6a9
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Nov 9 04:21:00 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Nov 9 04:21:00 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=fd7e689d
dev-python/numpy: Add 1.11.2-r1
Sync 1.10.4-r99 and drop the r99
dev-python/numpy/Manifest | 10 ++-
.../files/numpy-1.11.1-no-hardcode-blas.patch | 71 ++++++++++++++++++++++
.../numpy/files/numpy-1.11.1-no-xlocale.patch | 11 ++++
.../files/numpy-1.11.2-import-module-fix.patch | 27 ++++++++
...numpy-1.10.4-r99.ebuild => numpy-1.10.4.ebuild} | 11 ++--
...py-1.10.4-r99.ebuild => numpy-1.11.2-r1.ebuild} | 55 +++++++++++------
6 files changed, 159 insertions(+), 26 deletions(-)
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index c4ce421..38984c3 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,8 +1,16 @@
AUX numpy-1.10.1-musl-fix.patch 543 SHA256 2d3f0358f9a5a33f783817964d1985f48eaffb5f239f494b9a57cab1c35565d7 SHA512 b832d756e2518471c117e72bba01c5b93859d694948f545f136a12cca69dc9f9a459539fce8fde740c0822c423572ec6aa9e805a28a6d9620df36b54c52b1d8f WHIRLPOOL 8708b667ce5d86ef5e7b468d5e059cf7d3ca572fff5e462f0f12f3855e0addd0dc9170390f720b90ccbb01c330c308124596d9808ad05f8ea8c0658de63e8284
AUX numpy-1.10.2-no-hardcode-blas.patch 3295 SHA256 fb1ac68398a9c4fbf2396083e85480d46077d7b29069d8b62c4a929ab48216d1 SHA512 456f3b7016d12fea49c8db08cec81e207575a28018490c5b2eece8b4167e22dd93a5811d90f43435a0341ecb3a3cbc6c2fd804869ba9d96b7b2382736805aadd WHIRLPOOL 2a34f1f6f6a3a37a67b7cb1419b0aca7891ab9375cb5489f4ac974e71dff9f6e9442d0b3414437bf3010f271d7782b89b111ef34dcee1530c39e43bebe1a7b08
+AUX numpy-1.11.1-no-hardcode-blas.patch 3403 SHA256 c0943f88112e0aff962f2eac4478668d7bce35943791985d1b06a7184df569bb SHA512 0b32bf8e6fe08d139a589f5ca6a6d7d80716712f3cebcd84574ba5e90b283df84765d492f18e1fe3712aec6dbd6881a1b03e157e1cd6d42d6cd37022a62597aa WHIRLPOOL 5adec2edc32764f01563203731ca045bd7635a72e30eba27bae4bcd09adfe4a79996c0abef8b6856975e7bd5e63c1a7363e7fc6e6721711ce95fb7d343b89aeb
+AUX numpy-1.11.1-no-xlocale.patch 395 SHA256 e92d51ebbbc01dae37fab2c26b4ad64c4c791da62d52911ab8b6221ee732450a SHA512 2d53027efcb841ddc5ccc020d2a5df687815cf40b309c359f0efd7bfd431abc2786cf8b8b33b9873452f7907bd8b4f43470b5048ad122951a3b81203a5ae6494 WHIRLPOOL e4ddce622b7c7912936a54497f3077ee88a278468ca176758457ebe6de89bd33aebc3274ee85cf80a91d9d2a9cb68996fe7b42b7fee4bc9998d8673c6f4146c5
+AUX numpy-1.11.2-import-module-fix.patch 932 SHA256 890e1a4d48e510f890b1809b427bbe37ee25abe43349d859de7a9475a5f6b8dd SHA512 5f4b72cbab6a577490b029f3be5cbdacb0f161a26c20a37e1c924e5a9ba6403098de85cf578567292b31eb0a07c9f5ac6053f12c623e00e26605b6cc2f67ffe3 WHIRLPOOL 44db6690cf9bd91934ffddf572fc2821c67e4b56c09634a0eb68855c6b0969579747761596b3f48433a01a225061ea358807bea23f18d9f281a3a9f20a321105
DIST numpy-1.10.4.tar.gz 4069996 SHA256 7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 WHIRLPOOL 76946c2543b1cade06d71f83fd507bd818c1090baa9c3ddda7d1f48d48ed23672c5d9de76db890df990c6d8b7b26b71d3ce733c448943ad4177374a957360d1c
+DIST numpy-1.11.2.tar.gz 4178447 SHA256 04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69 SHA512 c1818de5c8b92cc2a673149f090cc863b484afd29e8a014ffcf8d0f5e70cf8886c7662dbe45847712dec8ae0412d1cb48b13cceefe3e4ec0e85bb20e4beaa46e WHIRLPOOL 668acc8ada165b57e1b2ab76969affa0098a5746c4ca21ae88cd189c5e6f79bde9d05bf951604d0c0f7400174f1e58f17fa0d662029f0b91cff78118fe3cdb0d
DIST numpy-html-1.10.1.zip 9663942 SHA256 4af48eb5abf2551f01d85aea7e9a99a30096777f02937dc185b16bb72a110366 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9 WHIRLPOOL d6c93e31e31c832fb21f117d03719e0375ee3d27fb6f7975bfcd12469df4a2ed0a25a16bd09a0e2113407446efc220e5bff534f7cd76a715c3d7df26c02f07a1
+DIST numpy-html-1.11.0.zip 9879611 SHA256 0244bff4b585ab417be963f492e69129e54bb83d630b463591f9e89c62807d85 SHA512 7bf416030c273c767a98d0f23adef0e5fd05f96f6bb911e32ec88821a5bc7c47a2799d33fb0706cb2d391ea6e47b3e0eef0d789eb1c0d81c982cfaa991a09822 WHIRLPOOL d7e81340aa1ec46c2b0d36b76e7a1e11ba7d1b39177a8168efe734936e1622808c8997a8cc22f773b9c3e17b51f5861e11eaf7fa89e9b0c61cae937ee7b5fdba
DIST numpy-ref-1.10.1.pdf 5382006 SHA256 72ae03348d0375ff2f18056efd04e815cc1d27b738d0685c80f5204a496bc279 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c WHIRLPOOL d904d9b2824bfb08a0eeffeb37f7d646d003c39230d950d387e2ddc8e475a117b8305a0ce3dc479be72f010b1a868f22ddfde17e6c4cd7c56630bbdf09afb90e
+DIST numpy-ref-1.11.0.pdf 5310792 SHA256 a975923b98f4dbd5a4736ab1c74a1c6393f422e3d1f9184bae2f12f041e3ac3e SHA512 a6bed225428645382846fcd60bc7961a44b0dc24cbfab3b4d0a1cee53092860f9db6226faf6597241ad6b9d6034837aace11214e0fc0c338702a574a9acf28df WHIRLPOOL c8757da7b11e4c47813112870dc96868d7bc6886d9454c0d18c6f8cad12c00a2185288233ffc41b580e9e232a1eaa4a19776055cff017ae56ff483fff0da1af1
DIST numpy-user-1.10.1.pdf 406114 SHA256 5180a5a1333365e474aabba9d6edd25276e79179fd708bb3989d95dc4e76215f SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4 WHIRLPOOL 4b53256663840738d288d38c4151e01ecfb515ebd4f69bb4330f4c5589642b3392a0a300f3def53df6bee8746f127a3af0d284601f288f4c4292df8b6de39f71
-EBUILD numpy-1.10.4-r99.ebuild 3933 SHA256 3dc5a293dc7b327de33b254bb4b465a04c483b7fcbfc85ae5f716be9e7f7be69 SHA512 a6a2b980fb02c356ad9c7baede082bfb12c43044c19009ab2f6026e87b8490cb78ba90919ad22d55ee0ec3478ed0d774d2436852c810ad91040fddf011780949 WHIRLPOOL d61cffe8da7124401c17fc4f5202d7415290fd3976162dfdf964ff26b56042e113729a455b8930eee7c2e156dd128235bb3a628f2496af7268ca4adc69600288
+DIST numpy-user-1.11.0.pdf 555403 SHA256 7ea6d24169d9e19d20ff131378d2bb5cd8b41658f242c87a1ffc53c3ac2e4b59 SHA512 8287acea5f6981119dfe223ff9cd2fd14f504b9a70418426ab716b80aea670b30249fbd727664ebf72d6d0660a84a57ff027a42cfe67946a7737a4308eebd786 WHIRLPOOL c72ad351a7f5cbd9c123c9d28c8178c7e463ee74e547a415d65dd6a5854fed090d86f9daa088eb79b48ca40e71d0ced5bc7cf938f631aece1846ae7eea9879b4
+EBUILD numpy-1.10.4.ebuild 4148 SHA256 3706256693f64a7394aa267ca85c96b43880292f77c316797e9e8d9beb4fb3be SHA512 bc741d1493c94acd16edd7906247e92aca0d050ec52aec70730ca98e4c472aa7559a9d57ead1eb9063665ea65e09cd0097a8703e79e941f9febc3d692d188be8 WHIRLPOOL 124eace432b972a42b8245e687b4e4b3d871a1b9c7001587b229dd4cf26c4cbc7a4cb785f4a5a431201f7ba41e28bcf82be274c68a467d1a0bcd147832e7e425
+EBUILD numpy-1.11.2-r1.ebuild 4827 SHA256 22f6b825810d1cd12eeb3ac77fa761c687e7a66a137a06f50e2ee40de6bbe342 SHA512 98b39f85acd1276d88eca4b62f1d704abe50b7675664d021ecb796579b34b783a6ed3b3caec006ecc08d59fa49b30453456e454b61b316a8271620a2848b849d WHIRLPOOL 9f42e7efe13da198e6e392e2522054673cc68da5d85355fd10ba88705ad42e7e12691c46f0b825f5184c7087028840de931f3e31a0b585f1701f51a7f575b4ce
MISC metadata.xml 876 SHA256 e95b995924f4ee2df04a6ca11978b72f204bba208e5979b3e4832998a5e954a4 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549 WHIRLPOOL 464a80aaf42947fa71b62134e77f788c5782441e79d0596cdbbfc81d8641c727298fb5eef4fe835c00ecb5ba9c7bd7f123ceff5eaa98dfb3aa9c45eecc75b8c9
diff --git a/dev-python/numpy/files/numpy-1.11.1-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.11.1-no-hardcode-blas.patch
new file mode 100644
index 0000000..1f6f9c4
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.11.1-no-hardcode-blas.patch
@@ -0,0 +1,71 @@
+--- numpy-1.11.1/numpy/distutils/system_info.py
++++ numpy-1.11.1/numpy/distutils/system_info.py
+@@ -312,26 +312,7 @@
+ 1 - display warning message
+ 2 - raise error
+ """
+- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead
+- 'atlas_threads': atlas_threads_info, # ditto
+- 'atlas_blas': atlas_blas_info,
+- 'atlas_blas_threads': atlas_blas_threads_info,
+- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead
+- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto
+- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead
+- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto
+- 'atlas_3_10_blas': atlas_3_10_blas_info,
+- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
+- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead
+- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto
+- 'mkl': mkl_info,
+- # openblas which may or may not have embedded lapack
+- 'openblas': openblas_info, # use blas_opt instead
+- # openblas with embedded lapack
+- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead
+- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead
+- 'blas_mkl': blas_mkl_info, # use blas_opt instead
+- 'x11': x11_info,
++ cl = {'x11': x11_info,
+ 'fft_opt': fft_opt_info,
+ 'fftw': fftw_info,
+ 'fftw2': fftw2_info,
+@@ -669,10 +650,7 @@
+ return [b for b in [a.strip() for a in libs.split(',')] if b]
+
+ def get_libraries(self, key='libraries'):
+- if hasattr(self, '_lib_names'):
+- return self.get_libs(key, default=self._lib_names)
+- else:
+- return self.get_libs(key, '')
++ return self.get_libs(key, '')
+
+ def library_extensions(self):
+ static_exts = ['.a']
+@@ -1685,7 +1663,7 @@
+ lib = self.has_cblas(info)
+ if lib is not None:
+ info['language'] = 'c'
+- info['libraries'] = [lib]
++ info['libraries'] = lib
+ info['define_macros'] = [('HAVE_CBLAS', None)]
+ self.set_info(**info)
+
+@@ -1718,16 +1696,16 @@
+ # check for cblas lib, and if not present check for blas lib.
+ try:
+ c.link_executable(obj, os.path.join(tmpdir, "a.out"),
+- libraries=["cblas"],
++ libraries=info["libraries"],
+ library_dirs=info['library_dirs'],
+ extra_postargs=info.get('extra_link_args', []))
+- res = "cblas"
++ res = info["libraries"]
+ except distutils.ccompiler.LinkError:
+ c.link_executable(obj, os.path.join(tmpdir, "a.out"),
+ libraries=["blas"],
+ library_dirs=info['library_dirs'],
+ extra_postargs=info.get('extra_link_args', []))
+- res = "blas"
++ res = ["blas"]
+ except distutils.ccompiler.CompileError:
+ res = None
+ finally:
diff --git a/dev-python/numpy/files/numpy-1.11.1-no-xlocale.patch b/dev-python/numpy/files/numpy-1.11.1-no-xlocale.patch
new file mode 100644
index 0000000..59b4378
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.11.1-no-xlocale.patch
@@ -0,0 +1,11 @@
+diff -Naur numpy-1.11.1.orig/numpy/core/src/multiarray/numpyos.c numpy-1.11.1/numpy/core/src/multiarray/numpyos.c
+--- numpy-1.11.1.orig/numpy/core/src/multiarray/numpyos.c 2016-06-25 16:59:40.000000000 -0700
++++ numpy-1.11.1/numpy/core/src/multiarray/numpyos.c 2016-08-30 13:51:30.607025309 -0700
+@@ -15,7 +15,6 @@
+
+ #ifdef HAVE_STRTOLD_L
+ #include <stdlib.h>
+-#include <xlocale.h>
+ #endif
+
+
diff --git a/dev-python/numpy/files/numpy-1.11.2-import-module-fix.patch b/dev-python/numpy/files/numpy-1.11.2-import-module-fix.patch
new file mode 100644
index 0000000..80b710b
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.11.2-import-module-fix.patch
@@ -0,0 +1,27 @@
+From 5d0ce36e5be134bb5ead03cab1edeaa60fa355aa Mon Sep 17 00:00:00 2001
+From: Jonathan Helmus <jjhelmus@gmail.com>
+Date: Wed, 12 Oct 2016 13:07:42 -0500
+Subject: [PATCH] BUG: import full module path in npy_load_module
+
+Use the full module path when importing importlib.machinery for use in the
+npy_load_module function. Just importing importlib is not sufficient in certain
+cases, for example Python 3.4.
+
+closes #8147
+---
+ numpy/compat/py3k.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/numpy/compat/py3k.py b/numpy/compat/py3k.py
+index 25cc535..d5bb2e4 100644
+--- a/numpy/compat/py3k.py
++++ b/numpy/compat/py3k.py
+@@ -118,7 +118,7 @@ def npy_load_module(name, fn, info=None):
+ mod : module
+
+ """
+- import importlib
++ import importlib.machinery
+ return importlib.machinery.SourceFileLoader(name, fn).load_module()
+ else:
+ def npy_load_module(name, fn, info=None):
diff --git a/dev-python/numpy/numpy-1.10.4-r99.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild
similarity index 91%
copy from dev-python/numpy/numpy-1.10.4-r99.ebuild
copy to dev-python/numpy/numpy-1.10.4.ebuild
index d2a05ce..1b6a5d3 100644
--- a/dev-python/numpy/numpy-1.10.4-r99.ebuild
+++ b/dev-python/numpy/numpy-1.10.4.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
PYTHON_REQ_USE="threads(+)"
FORTRAN_NEEDED=lapack
@@ -25,7 +25,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
# It appears the docs haven't been upgraded, still @ 1.8.1
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack test"
RDEPEND="
@@ -110,11 +110,12 @@ python_prepare_all() {
sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
# we don't have f2py-3.3
-# sed \
-# -e 's:test_f2py:_&:g' \
-# -i numpy/tests/test_scripts.py || die
+ sed \
+ -e 's:test_f2py:_&:g' \
+ -i numpy/tests/test_scripts.py || die
distutils-r1_python_prepare_all
+ epatch_user
}
python_compile() {
diff --git a/dev-python/numpy/numpy-1.10.4-r99.ebuild b/dev-python/numpy/numpy-1.11.2-r1.ebuild
similarity index 67%
rename from dev-python/numpy/numpy-1.10.4-r99.ebuild
rename to dev-python/numpy/numpy-1.11.2-r1.ebuild
index d2a05ce..9f82953 100644
--- a/dev-python/numpy/numpy-1.10.4-r99.ebuild
+++ b/dev-python/numpy/numpy-1.11.2-r1.ebuild
@@ -2,16 +2,16 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
PYTHON_REQ_USE="threads(+)"
FORTRAN_NEEDED=lapack
-inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs versionator
-DOC_PV="1.10.1"
+DOC_PV="1.11.0"
DOC_P="${PN}-${DOC_PV}"
DESCRIPTION="Fast array and numerical python library"
@@ -22,26 +22,26 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
)"
-# It appears the docs haven't been upgraded, still @ 1.8.1
+# It appears the docs haven't been upgraded, still @ 1.11.0
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack test"
-RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- lapack? ( virtual/cblas virtual/lapack )"
+RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( app-arch/unzip )
lapack? ( virtual/pkgconfig )
test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
-# Uses distutils.command.config.
-DISTUTILS_IN_SOURCE_BUILD=1
-
PATCHES=(
- "${FILESDIR}"/${PN}-1.10.2-no-hardcode-blas.patch
- "${FILESDIR}"/${PN}-1.10.1-musl-fix.patch
+ "${FILESDIR}"/${PN}-1.11.1-no-hardcode-blas.patch
+ "${FILESDIR}"/${PN}-1.11.1-no-xlocale.patch
+
+ # This has been fixed upstream but no new release yet
+ # https://github.com/numpy/numpy/commit/5d0ce36e5be134bb5ead03cab1edeaa60fa355aa
+ "${FILESDIR}"/${P}-import-module-fix.patch
)
src_unpack() {
@@ -72,7 +72,7 @@ python_prepare_all() {
if use lapack; then
append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
local libdir="${EPREFIX}"/usr/$(get_libdir)
- cat >> site.cfg <<-EOF
+ cat >> site.cfg <<-EOF || die
[blas]
include_dirs = $(pc_incdir cblas)
library_dirs = $(pc_libdir cblas blas):${libdir}
@@ -110,9 +110,23 @@ python_prepare_all() {
sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
# we don't have f2py-3.3
-# sed \
-# -e 's:test_f2py:_&:g' \
-# -i numpy/tests/test_scripts.py || die
+ sed \
+ -e 's:test_f2py:_&:g' \
+ -i numpy/tests/test_scripts.py || die
+
+ # QA bug 590464
+ # The .py files from numpy/core/tests are just added, instead
+ # of being bytecode compiled as a proper subdir package.
+ # We trick the buildsystem into accepting it as a bytecode
+ # package by adding a setup.py and an empty __init__.py
+ #cp numpy/{compat/setup.py,core/tests} || die
+ #touch numpy/core/tests/__init__.py || die
+ #sed \
+ # -e 's:compat:tests:' \
+ # -i numpy/core/tests/setup.py || die
+ #sed \
+ # -e "s:config\.add_data_dir('tests'):config\.add_subpackage('tests'):" \
+ # -i numpy/core/setup.py || die
distutils-r1_python_prepare_all
}
@@ -124,9 +138,10 @@ python_compile() {
}
python_test() {
- distutils_install_for_testing ${NUMPY_FCONFIG}
+ distutils_install_for_testing --single-version-externally-managed --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
cd "${TMPDIR}" || die
+
${EPYTHON} -c "
import numpy, sys
r = numpy.test(label='full', verbose=3)
@@ -138,7 +153,7 @@ python_install() {
}
python_install_all() {
- DOCS+=( COMPATIBILITY DEV_README.txt THANKS.txt )
+ DOCS+=( THANKS.txt )
if use doc; then
HTML_DOCS=( "${WORKDIR}"/html/. )
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-python/numpy/files/, dev-python/numpy/
@ 2017-02-28 18:20 Aric Belsito
0 siblings, 0 replies; 6+ messages in thread
From: Aric Belsito @ 2017-02-28 18:20 UTC (permalink / raw
To: gentoo-commits
commit: c87769ab4f410399e3a65c38827b72d733016b73
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Feb 28 18:10:52 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Feb 28 18:10:52 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c87769ab
dev-python/numpy: sync with upstream
dev-python/numpy/Manifest | 5 +++--
.../files/numpy-1.11.2-blas_rec_inc_dir.patch | 24 ++++++++++++++++++++++
dev-python/numpy/numpy-1.10.4.ebuild | 4 ++--
dev-python/numpy/numpy-1.11.2-r1.ebuild | 4 ++--
4 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 3cf354d..58ed08d 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -2,6 +2,7 @@ AUX numpy-1.10.1-musl-fix.patch 543 SHA256 2d3f0358f9a5a33f783817964d1985f48eaff
AUX numpy-1.10.2-no-hardcode-blas.patch 3295 SHA256 fb1ac68398a9c4fbf2396083e85480d46077d7b29069d8b62c4a929ab48216d1 SHA512 456f3b7016d12fea49c8db08cec81e207575a28018490c5b2eece8b4167e22dd93a5811d90f43435a0341ecb3a3cbc6c2fd804869ba9d96b7b2382736805aadd WHIRLPOOL 2a34f1f6f6a3a37a67b7cb1419b0aca7891ab9375cb5489f4ac974e71dff9f6e9442d0b3414437bf3010f271d7782b89b111ef34dcee1530c39e43bebe1a7b08
AUX numpy-1.11.1-no-hardcode-blas.patch 3403 SHA256 c0943f88112e0aff962f2eac4478668d7bce35943791985d1b06a7184df569bb SHA512 0b32bf8e6fe08d139a589f5ca6a6d7d80716712f3cebcd84574ba5e90b283df84765d492f18e1fe3712aec6dbd6881a1b03e157e1cd6d42d6cd37022a62597aa WHIRLPOOL 5adec2edc32764f01563203731ca045bd7635a72e30eba27bae4bcd09adfe4a79996c0abef8b6856975e7bd5e63c1a7363e7fc6e6721711ce95fb7d343b89aeb
AUX numpy-1.11.1-no-xlocale.patch 395 SHA256 e92d51ebbbc01dae37fab2c26b4ad64c4c791da62d52911ab8b6221ee732450a SHA512 2d53027efcb841ddc5ccc020d2a5df687815cf40b309c359f0efd7bfd431abc2786cf8b8b33b9873452f7907bd8b4f43470b5048ad122951a3b81203a5ae6494 WHIRLPOOL e4ddce622b7c7912936a54497f3077ee88a278468ca176758457ebe6de89bd33aebc3274ee85cf80a91d9d2a9cb68996fe7b42b7fee4bc9998d8673c6f4146c5
+AUX numpy-1.11.2-blas_rec_inc_dir.patch 958 SHA256 81d7cd91ad08cc5ae26cb16e955b1b52ba7c373d38b27979e868b300e782cdf8 SHA512 c1a10bc9f14fb42e2bd3e361059cde594c539e360f4388cb7fd202e49b2aee6b2e2d9e299094aaa7972a7495e792c1d3dce23da6813d050f66fccefe41b66228 WHIRLPOOL d13a5d51f5d6189372ac732cdc2f94d14b54fc5faa5d44174dc5377a491b8f50f0d14868a5aaf10c0abd0f5b5d3f65bba1f97a4961063ce161aa97da3fbb5193
AUX numpy-1.11.2-import-module-fix.patch 932 SHA256 890e1a4d48e510f890b1809b427bbe37ee25abe43349d859de7a9475a5f6b8dd SHA512 5f4b72cbab6a577490b029f3be5cbdacb0f161a26c20a37e1c924e5a9ba6403098de85cf578567292b31eb0a07c9f5ac6053f12c623e00e26605b6cc2f67ffe3 WHIRLPOOL 44db6690cf9bd91934ffddf572fc2821c67e4b56c09634a0eb68855c6b0969579747761596b3f48433a01a225061ea358807bea23f18d9f281a3a9f20a321105
DIST numpy-1.10.4.tar.gz 4069996 SHA256 7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 WHIRLPOOL 76946c2543b1cade06d71f83fd507bd818c1090baa9c3ddda7d1f48d48ed23672c5d9de76db890df990c6d8b7b26b71d3ce733c448943ad4177374a957360d1c
DIST numpy-1.11.2.tar.gz 4178447 SHA256 04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69 SHA512 c1818de5c8b92cc2a673149f090cc863b484afd29e8a014ffcf8d0f5e70cf8886c7662dbe45847712dec8ae0412d1cb48b13cceefe3e4ec0e85bb20e4beaa46e WHIRLPOOL 668acc8ada165b57e1b2ab76969affa0098a5746c4ca21ae88cd189c5e6f79bde9d05bf951604d0c0f7400174f1e58f17fa0d662029f0b91cff78118fe3cdb0d
@@ -11,6 +12,6 @@ DIST numpy-ref-1.10.1.pdf 5382006 SHA256 72ae03348d0375ff2f18056efd04e815cc1d27b
DIST numpy-ref-1.11.0.pdf 5310792 SHA256 a975923b98f4dbd5a4736ab1c74a1c6393f422e3d1f9184bae2f12f041e3ac3e SHA512 a6bed225428645382846fcd60bc7961a44b0dc24cbfab3b4d0a1cee53092860f9db6226faf6597241ad6b9d6034837aace11214e0fc0c338702a574a9acf28df WHIRLPOOL c8757da7b11e4c47813112870dc96868d7bc6886d9454c0d18c6f8cad12c00a2185288233ffc41b580e9e232a1eaa4a19776055cff017ae56ff483fff0da1af1
DIST numpy-user-1.10.1.pdf 406114 SHA256 5180a5a1333365e474aabba9d6edd25276e79179fd708bb3989d95dc4e76215f SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4 WHIRLPOOL 4b53256663840738d288d38c4151e01ecfb515ebd4f69bb4330f4c5589642b3392a0a300f3def53df6bee8746f127a3af0d284601f288f4c4292df8b6de39f71
DIST numpy-user-1.11.0.pdf 555403 SHA256 7ea6d24169d9e19d20ff131378d2bb5cd8b41658f242c87a1ffc53c3ac2e4b59 SHA512 8287acea5f6981119dfe223ff9cd2fd14f504b9a70418426ab716b80aea670b30249fbd727664ebf72d6d0660a84a57ff027a42cfe67946a7737a4308eebd786 WHIRLPOOL c72ad351a7f5cbd9c123c9d28c8178c7e463ee74e547a415d65dd6a5854fed090d86f9daa088eb79b48ca40e71d0ced5bc7cf938f631aece1846ae7eea9879b4
-EBUILD numpy-1.10.4.ebuild 4122 SHA256 a61938b9f5e024c4b7d163452ea1bad398b0b4f2befc92165459cc77e9f781dc SHA512 750a64fc459b4c6e40b4b4cdba3cd7c010f14f83b358f2e897d8485bdd6595cfa447a69da5d7a5b66fc8f0c083d68ea1946d816df79f70a7a7ad9ca84f4d8cd6 WHIRLPOOL b5080726ff5ef082083b47703c492b13be09b39c6bb37786189ba9333068893e7d47afc619cda3bddc985d2890aa476f2714265c02f44e638cad2166da4c8fc7
-EBUILD numpy-1.11.2-r1.ebuild 4801 SHA256 51ddf4382f238b1e097605ad7080f252712881d2f4705cbae3f221cafb54fcda SHA512 36c6a399cd74839a462cdf8158254791ca3695d9b985c81ec8be02a0da38a525d513a6aba23b58bf6420d8fc27ccab5fdfedbe0f760ec9fefa8e6aaa530bcf08 WHIRLPOOL 97999b2532f8e6e223e52d1d2c0d3fcbc40a27699837ea6fdfdbecd2f2a4b65ad5493d450ec1d5796de151303e97e7c41af5565708bcf5290bf88a6600c1ee83
+EBUILD numpy-1.10.4.ebuild 4123 SHA256 9112b053bd3197d7bad0e5ec16f3f52cd18fa4a8f68820bea2d90174f401c221 SHA512 fdcd3969d8c6932c3f5124d1a68f80a7c1be7fb6171c652ec02c716550be6bb5eefb46a292fff7908ab67232c59105fe25a84a5b63dae787dabad41af9590f1a WHIRLPOOL afddcb18bf806169f759b1c4c0116293093533f13b3b1feedf79aa2a3a840a1af9261bdf33607d903fe148c76dcacc1804a3f19e880b7b21bd13549cfd57a381
+EBUILD numpy-1.11.2-r1.ebuild 4853 SHA256 3a3e6955c0fac80f2713ba57716191a1bc38079a657514c041c12154c3c24e7f SHA512 17d3e49cd392f67a8ca09bba77a5758a14eabf640264d61ec689353f839b8303cc9559cb427fa87939b916c926ae7ddeb5a702f3b4d3eb7bc3d4dffb2d31c93f WHIRLPOOL afe693fb794009b852e08de7c994081a697a50bcd70f61139b6788a8a1a522971437c689a6f94e504c2b21d8b87b2ecac40fc09a9ad73fc8e3ebeb0fcf66ab9e
MISC metadata.xml 876 SHA256 e95b995924f4ee2df04a6ca11978b72f204bba208e5979b3e4832998a5e954a4 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549 WHIRLPOOL 464a80aaf42947fa71b62134e77f788c5782441e79d0596cdbbfc81d8641c727298fb5eef4fe835c00ecb5ba9c7bd7f123ceff5eaa98dfb3aa9c45eecc75b8c9
diff --git a/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch b/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch
new file mode 100644
index 0000000..9a934cc
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch
@@ -0,0 +1,24 @@
+commit 61e9159569a601315b67c30b6e26bbb2149c0bfa
+Author: Benda Xu <heroxbd@gentoo.org>
+Date: Wed Feb 15 11:17:05 2017 +0900
+
+ BUG: blas_info should record include_dirs
+
+ blas specified in site.cfg could have non-standard include dirs.
+ It should be read and saved in distutils/__config__.py
+
+PR: https://github.com/numpy/numpy/pull/8619
+
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
+index b8520ac..0fba865 100644
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -1667,6 +1667,8 @@ class blas_info(system_info):
+ info = self.check_libs(lib_dirs, blas_libs, [])
+ if info is None:
+ return
++ else:
++ info['include_dirs'] = self.get_include_dirs()
+ if platform.system() == 'Windows':
+ # The check for windows is needed because has_cblas uses the
+ # same compiler that was used to compile Python and msvc is
diff --git a/dev-python/numpy/numpy-1.10.4.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild
index ac0bf37..4533b07 100644
--- a/dev-python/numpy/numpy-1.10.4.ebuild
+++ b/dev-python/numpy/numpy-1.10.4.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
PYTHON_REQ_USE="threads(+)"
FORTRAN_NEEDED=lapack
@@ -25,7 +25,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
# It appears the docs haven't been upgraded, still @ 1.8.1
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack test"
RDEPEND="
diff --git a/dev-python/numpy/numpy-1.11.2-r1.ebuild b/dev-python/numpy/numpy-1.11.2-r1.ebuild
index 79f985d..7de119b 100644
--- a/dev-python/numpy/numpy-1.11.2-r1.ebuild
+++ b/dev-python/numpy/numpy-1.11.2-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
PYTHON_REQ_USE="threads(+)"
FORTRAN_NEEDED=lapack
@@ -37,8 +37,8 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-1.11.1-no-hardcode-blas.patch
+ "${FILESDIR}"/${PN}-1.11.2-blas_rec_inc_dir.patch
"${FILESDIR}"/${PN}-1.11.1-no-xlocale.patch
-
# This has been fixed upstream but no new release yet
# https://github.com/numpy/numpy/commit/5d0ce36e5be134bb5ead03cab1edeaa60fa355aa
"${FILESDIR}"/${P}-import-module-fix.patch
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-python/numpy/files/, dev-python/numpy/
@ 2017-04-14 23:43 Aric Belsito
0 siblings, 0 replies; 6+ messages in thread
From: Aric Belsito @ 2017-04-14 23:43 UTC (permalink / raw
To: gentoo-commits
commit: d85d2e6cbfb1ed8160368b6734edfb99188e63ac
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Fri Apr 14 23:43:17 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Fri Apr 14 23:43:17 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=d85d2e6c
dev-python/numpy: version bump to 1.12.1
dev-python/numpy/Manifest | 9 ++++----
.../files/numpy-1.11.2-import-module-fix.patch | 27 ----------------------
...s.patch => numpy-1.12.1-no-hardcode-blas.patch} | 3 ++-
dev-python/numpy/numpy-1.10.4.ebuild | 1 -
...{numpy-1.11.2-r1.ebuild => numpy-1.12.1.ebuild} | 9 +++-----
5 files changed, 9 insertions(+), 40 deletions(-)
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 58ed08d..6b85c06 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,17 +1,16 @@
AUX numpy-1.10.1-musl-fix.patch 543 SHA256 2d3f0358f9a5a33f783817964d1985f48eaffb5f239f494b9a57cab1c35565d7 SHA512 b832d756e2518471c117e72bba01c5b93859d694948f545f136a12cca69dc9f9a459539fce8fde740c0822c423572ec6aa9e805a28a6d9620df36b54c52b1d8f WHIRLPOOL 8708b667ce5d86ef5e7b468d5e059cf7d3ca572fff5e462f0f12f3855e0addd0dc9170390f720b90ccbb01c330c308124596d9808ad05f8ea8c0658de63e8284
AUX numpy-1.10.2-no-hardcode-blas.patch 3295 SHA256 fb1ac68398a9c4fbf2396083e85480d46077d7b29069d8b62c4a929ab48216d1 SHA512 456f3b7016d12fea49c8db08cec81e207575a28018490c5b2eece8b4167e22dd93a5811d90f43435a0341ecb3a3cbc6c2fd804869ba9d96b7b2382736805aadd WHIRLPOOL 2a34f1f6f6a3a37a67b7cb1419b0aca7891ab9375cb5489f4ac974e71dff9f6e9442d0b3414437bf3010f271d7782b89b111ef34dcee1530c39e43bebe1a7b08
-AUX numpy-1.11.1-no-hardcode-blas.patch 3403 SHA256 c0943f88112e0aff962f2eac4478668d7bce35943791985d1b06a7184df569bb SHA512 0b32bf8e6fe08d139a589f5ca6a6d7d80716712f3cebcd84574ba5e90b283df84765d492f18e1fe3712aec6dbd6881a1b03e157e1cd6d42d6cd37022a62597aa WHIRLPOOL 5adec2edc32764f01563203731ca045bd7635a72e30eba27bae4bcd09adfe4a79996c0abef8b6856975e7bd5e63c1a7363e7fc6e6721711ce95fb7d343b89aeb
AUX numpy-1.11.1-no-xlocale.patch 395 SHA256 e92d51ebbbc01dae37fab2c26b4ad64c4c791da62d52911ab8b6221ee732450a SHA512 2d53027efcb841ddc5ccc020d2a5df687815cf40b309c359f0efd7bfd431abc2786cf8b8b33b9873452f7907bd8b4f43470b5048ad122951a3b81203a5ae6494 WHIRLPOOL e4ddce622b7c7912936a54497f3077ee88a278468ca176758457ebe6de89bd33aebc3274ee85cf80a91d9d2a9cb68996fe7b42b7fee4bc9998d8673c6f4146c5
AUX numpy-1.11.2-blas_rec_inc_dir.patch 958 SHA256 81d7cd91ad08cc5ae26cb16e955b1b52ba7c373d38b27979e868b300e782cdf8 SHA512 c1a10bc9f14fb42e2bd3e361059cde594c539e360f4388cb7fd202e49b2aee6b2e2d9e299094aaa7972a7495e792c1d3dce23da6813d050f66fccefe41b66228 WHIRLPOOL d13a5d51f5d6189372ac732cdc2f94d14b54fc5faa5d44174dc5377a491b8f50f0d14868a5aaf10c0abd0f5b5d3f65bba1f97a4961063ce161aa97da3fbb5193
-AUX numpy-1.11.2-import-module-fix.patch 932 SHA256 890e1a4d48e510f890b1809b427bbe37ee25abe43349d859de7a9475a5f6b8dd SHA512 5f4b72cbab6a577490b029f3be5cbdacb0f161a26c20a37e1c924e5a9ba6403098de85cf578567292b31eb0a07c9f5ac6053f12c623e00e26605b6cc2f67ffe3 WHIRLPOOL 44db6690cf9bd91934ffddf572fc2821c67e4b56c09634a0eb68855c6b0969579747761596b3f48433a01a225061ea358807bea23f18d9f281a3a9f20a321105
+AUX numpy-1.12.1-no-hardcode-blas.patch 3473 SHA256 6c3563123a6fbc8c76648c5c4875af694d161ad8294b02cec3014c10e78c2d7f SHA512 0066fdc822151b13a4f91cab522000ab43bea52539100070949d08e0baf6bd35e9c32e13e877e22c40041c3fa0e8d716d802087b3c9016d6c1e05edd0e48fd6a WHIRLPOOL 700003d10c0681f0a41dd487eb0b2171042eeed70d667bd86fea4b6c9fc8ee842bbcacc6c2bc0d430a1213e311a01fb8ed465ed5b52a11565a2639f3159f8634
DIST numpy-1.10.4.tar.gz 4069996 SHA256 7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 WHIRLPOOL 76946c2543b1cade06d71f83fd507bd818c1090baa9c3ddda7d1f48d48ed23672c5d9de76db890df990c6d8b7b26b71d3ce733c448943ad4177374a957360d1c
-DIST numpy-1.11.2.tar.gz 4178447 SHA256 04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69 SHA512 c1818de5c8b92cc2a673149f090cc863b484afd29e8a014ffcf8d0f5e70cf8886c7662dbe45847712dec8ae0412d1cb48b13cceefe3e4ec0e85bb20e4beaa46e WHIRLPOOL 668acc8ada165b57e1b2ab76969affa0098a5746c4ca21ae88cd189c5e6f79bde9d05bf951604d0c0f7400174f1e58f17fa0d662029f0b91cff78118fe3cdb0d
+DIST numpy-1.12.1.zip 4824784 SHA256 a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542 SHA512 156319821e4f0cf8d820e977da704aab274b7a4a4b792f6e40d7c0f2827700c990f55f1ca9650523c62c9e937f0e75f336d091d46ca47aaa9875c68fe32bac2a WHIRLPOOL 1ecd1df77d2a64bc6db1910446f60b477ebf5a1cf33ec2e1fced56dbbf1a7df5fef004c7f84f0dccb0ca20ea7ab73c384e4d247eb9700159a18c9a4a51e4db6d
DIST numpy-html-1.10.1.zip 9663942 SHA256 4af48eb5abf2551f01d85aea7e9a99a30096777f02937dc185b16bb72a110366 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9 WHIRLPOOL d6c93e31e31c832fb21f117d03719e0375ee3d27fb6f7975bfcd12469df4a2ed0a25a16bd09a0e2113407446efc220e5bff534f7cd76a715c3d7df26c02f07a1
DIST numpy-html-1.11.0.zip 9879611 SHA256 0244bff4b585ab417be963f492e69129e54bb83d630b463591f9e89c62807d85 SHA512 7bf416030c273c767a98d0f23adef0e5fd05f96f6bb911e32ec88821a5bc7c47a2799d33fb0706cb2d391ea6e47b3e0eef0d789eb1c0d81c982cfaa991a09822 WHIRLPOOL d7e81340aa1ec46c2b0d36b76e7a1e11ba7d1b39177a8168efe734936e1622808c8997a8cc22f773b9c3e17b51f5861e11eaf7fa89e9b0c61cae937ee7b5fdba
DIST numpy-ref-1.10.1.pdf 5382006 SHA256 72ae03348d0375ff2f18056efd04e815cc1d27b738d0685c80f5204a496bc279 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c WHIRLPOOL d904d9b2824bfb08a0eeffeb37f7d646d003c39230d950d387e2ddc8e475a117b8305a0ce3dc479be72f010b1a868f22ddfde17e6c4cd7c56630bbdf09afb90e
DIST numpy-ref-1.11.0.pdf 5310792 SHA256 a975923b98f4dbd5a4736ab1c74a1c6393f422e3d1f9184bae2f12f041e3ac3e SHA512 a6bed225428645382846fcd60bc7961a44b0dc24cbfab3b4d0a1cee53092860f9db6226faf6597241ad6b9d6034837aace11214e0fc0c338702a574a9acf28df WHIRLPOOL c8757da7b11e4c47813112870dc96868d7bc6886d9454c0d18c6f8cad12c00a2185288233ffc41b580e9e232a1eaa4a19776055cff017ae56ff483fff0da1af1
DIST numpy-user-1.10.1.pdf 406114 SHA256 5180a5a1333365e474aabba9d6edd25276e79179fd708bb3989d95dc4e76215f SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4 WHIRLPOOL 4b53256663840738d288d38c4151e01ecfb515ebd4f69bb4330f4c5589642b3392a0a300f3def53df6bee8746f127a3af0d284601f288f4c4292df8b6de39f71
DIST numpy-user-1.11.0.pdf 555403 SHA256 7ea6d24169d9e19d20ff131378d2bb5cd8b41658f242c87a1ffc53c3ac2e4b59 SHA512 8287acea5f6981119dfe223ff9cd2fd14f504b9a70418426ab716b80aea670b30249fbd727664ebf72d6d0660a84a57ff027a42cfe67946a7737a4308eebd786 WHIRLPOOL c72ad351a7f5cbd9c123c9d28c8178c7e463ee74e547a415d65dd6a5854fed090d86f9daa088eb79b48ca40e71d0ced5bc7cf938f631aece1846ae7eea9879b4
-EBUILD numpy-1.10.4.ebuild 4123 SHA256 9112b053bd3197d7bad0e5ec16f3f52cd18fa4a8f68820bea2d90174f401c221 SHA512 fdcd3969d8c6932c3f5124d1a68f80a7c1be7fb6171c652ec02c716550be6bb5eefb46a292fff7908ab67232c59105fe25a84a5b63dae787dabad41af9590f1a WHIRLPOOL afddcb18bf806169f759b1c4c0116293093533f13b3b1feedf79aa2a3a840a1af9261bdf33607d903fe148c76dcacc1804a3f19e880b7b21bd13549cfd57a381
-EBUILD numpy-1.11.2-r1.ebuild 4853 SHA256 3a3e6955c0fac80f2713ba57716191a1bc38079a657514c041c12154c3c24e7f SHA512 17d3e49cd392f67a8ca09bba77a5758a14eabf640264d61ec689353f839b8303cc9559cb427fa87939b916c926ae7ddeb5a702f3b4d3eb7bc3d4dffb2d31c93f WHIRLPOOL afe693fb794009b852e08de7c994081a697a50bcd70f61139b6788a8a1a522971437c689a6f94e504c2b21d8b87b2ecac40fc09a9ad73fc8e3ebeb0fcf66ab9e
+EBUILD numpy-1.10.4.ebuild 4116 SHA256 5bafcebdb2517abdbb3cda4f539b3b26b18d9dcfac20a886a91aa9252f51f2d5 SHA512 6a3bdecca124dde80c432b8a15f7a550999b15a0868a3672f30d97d600cd5aad33b98a15d831dcfd3ba79d0240aa7abd08f8076e5ab484980af9f3bb3cec6bc4 WHIRLPOOL 019886435a82eb071bef26812a58a4a497ef012a401754884c75e447648a5e87c6c3f668d3afffc45d95be77b7e5395741379b8ac675b55ddfdd56791ef32149
+EBUILD numpy-1.12.1.ebuild 4656 SHA256 d3198d5fdbd24ca7b9bf37619836d10800748b05ee02312f8bd4f709f1159f4c SHA512 a0382498b092c2bea421bf6b22d4e13c3ca1fd52fc2c851b9be3f567ad1af7e1a2dbee93c516f6b73f50750ceeb9680f538da6306c8fc7d137aa6a2e8b28d5f6 WHIRLPOOL bbb0b7dae0aaa4ec36fbc3354581eaad7544c43dde4526c966937268bb7cc47027b45127af8dcf97f6bf95eef6bfca7eb9af55b147d04dcae6b6d4d29c4034eb
MISC metadata.xml 876 SHA256 e95b995924f4ee2df04a6ca11978b72f204bba208e5979b3e4832998a5e954a4 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549 WHIRLPOOL 464a80aaf42947fa71b62134e77f788c5782441e79d0596cdbbfc81d8641c727298fb5eef4fe835c00ecb5ba9c7bd7f123ceff5eaa98dfb3aa9c45eecc75b8c9
diff --git a/dev-python/numpy/files/numpy-1.11.2-import-module-fix.patch b/dev-python/numpy/files/numpy-1.11.2-import-module-fix.patch
deleted file mode 100644
index 80b710b..0000000
--- a/dev-python/numpy/files/numpy-1.11.2-import-module-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5d0ce36e5be134bb5ead03cab1edeaa60fa355aa Mon Sep 17 00:00:00 2001
-From: Jonathan Helmus <jjhelmus@gmail.com>
-Date: Wed, 12 Oct 2016 13:07:42 -0500
-Subject: [PATCH] BUG: import full module path in npy_load_module
-
-Use the full module path when importing importlib.machinery for use in the
-npy_load_module function. Just importing importlib is not sufficient in certain
-cases, for example Python 3.4.
-
-closes #8147
----
- numpy/compat/py3k.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/numpy/compat/py3k.py b/numpy/compat/py3k.py
-index 25cc535..d5bb2e4 100644
---- a/numpy/compat/py3k.py
-+++ b/numpy/compat/py3k.py
-@@ -118,7 +118,7 @@ def npy_load_module(name, fn, info=None):
- mod : module
-
- """
-- import importlib
-+ import importlib.machinery
- return importlib.machinery.SourceFileLoader(name, fn).load_module()
- else:
- def npy_load_module(name, fn, info=None):
diff --git a/dev-python/numpy/files/numpy-1.11.1-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch
similarity index 97%
rename from dev-python/numpy/files/numpy-1.11.1-no-hardcode-blas.patch
rename to dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch
index 1f6f9c4..81d6084 100644
--- a/dev-python/numpy/files/numpy-1.11.1-no-hardcode-blas.patch
+++ b/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch
@@ -1,6 +1,6 @@
--- numpy-1.11.1/numpy/distutils/system_info.py
+++ numpy-1.11.1/numpy/distutils/system_info.py
-@@ -312,26 +312,7 @@
+@@ -312,27 +312,7 @@
1 - display warning message
2 - raise error
"""
@@ -21,6 +21,7 @@
- 'openblas': openblas_info, # use blas_opt instead
- # openblas with embedded lapack
- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead
+- 'blis': blis_info, # use blas_opt instead
- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead
- 'blas_mkl': blas_mkl_info, # use blas_opt instead
- 'x11': x11_info,
diff --git a/dev-python/numpy/numpy-1.10.4.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild
index 4533b07..96b5cb9 100644
--- a/dev-python/numpy/numpy-1.10.4.ebuild
+++ b/dev-python/numpy/numpy-1.10.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/dev-python/numpy/numpy-1.11.2-r1.ebuild b/dev-python/numpy/numpy-1.12.1.ebuild
similarity index 94%
rename from dev-python/numpy/numpy-1.11.2-r1.ebuild
rename to dev-python/numpy/numpy-1.12.1.ebuild
index 7de119b..7ff8bba 100644
--- a/dev-python/numpy/numpy-1.11.2-r1.ebuild
+++ b/dev-python/numpy/numpy-1.12.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
@@ -16,7 +15,8 @@ DOC_P="${PN}-${DOC_PV}"
DESCRIPTION="Fast array and numerical python library"
HOMEPAGE="http://www.numpy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+SRC_URI="
+ mirror://pypi/${PN:0:1}/${PN}/${P}.zip
doc? (
http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
@@ -36,12 +36,9 @@ DEPEND="${RDEPEND}
test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
PATCHES=(
- "${FILESDIR}"/${PN}-1.11.1-no-hardcode-blas.patch
+ "${FILESDIR}"/${P}-no-hardcode-blas.patch
"${FILESDIR}"/${PN}-1.11.2-blas_rec_inc_dir.patch
"${FILESDIR}"/${PN}-1.11.1-no-xlocale.patch
- # This has been fixed upstream but no new release yet
- # https://github.com/numpy/numpy/commit/5d0ce36e5be134bb5ead03cab1edeaa60fa355aa
- "${FILESDIR}"/${P}-import-module-fix.patch
)
src_unpack() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-python/numpy/files/, dev-python/numpy/
@ 2018-03-29 19:51 Aric Belsito
0 siblings, 0 replies; 6+ messages in thread
From: Aric Belsito @ 2018-03-29 19:51 UTC (permalink / raw
To: gentoo-commits
commit: 3c018e22d3beb9d5075d868edbcd9712f5b13f76
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Mar 29 19:51:14 2018 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Mar 29 19:51:14 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3c018e22
dev-python/numpy: remove 1.12.1
1.13.3 in the tree works
dev-python/numpy/Manifest | 4 -
.../numpy/files/numpy-1.11.1-no-xlocale.patch | 11 --
.../files/numpy-1.11.2-blas_rec_inc_dir.patch | 24 ---
.../files/numpy-1.12.1-no-hardcode-blas.patch | 72 ---------
dev-python/numpy/numpy-1.12.1.ebuild | 165 ---------------------
5 files changed, 276 deletions(-)
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 9805205..2150cf4 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,8 +1,4 @@
DIST numpy-1.10.4.tar.gz 4069996 SHA256 7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b SHA512 57ace46e357d49be0efd904e5ceb9862c626c916987c8798a12de7ae1e06816ad8483439ac4619792a04889631b5998f2397dc601c78dea33a784b4831c19c79 WHIRLPOOL 76946c2543b1cade06d71f83fd507bd818c1090baa9c3ddda7d1f48d48ed23672c5d9de76db890df990c6d8b7b26b71d3ce733c448943ad4177374a957360d1c
-DIST numpy-1.12.1.zip 4824784 SHA256 a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542 SHA512 156319821e4f0cf8d820e977da704aab274b7a4a4b792f6e40d7c0f2827700c990f55f1ca9650523c62c9e937f0e75f336d091d46ca47aaa9875c68fe32bac2a WHIRLPOOL 1ecd1df77d2a64bc6db1910446f60b477ebf5a1cf33ec2e1fced56dbbf1a7df5fef004c7f84f0dccb0ca20ea7ab73c384e4d247eb9700159a18c9a4a51e4db6d
DIST numpy-html-1.10.1.zip 9663942 SHA256 4af48eb5abf2551f01d85aea7e9a99a30096777f02937dc185b16bb72a110366 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9 WHIRLPOOL d6c93e31e31c832fb21f117d03719e0375ee3d27fb6f7975bfcd12469df4a2ed0a25a16bd09a0e2113407446efc220e5bff534f7cd76a715c3d7df26c02f07a1
-DIST numpy-html-1.11.0.zip 9879611 SHA256 0244bff4b585ab417be963f492e69129e54bb83d630b463591f9e89c62807d85 SHA512 7bf416030c273c767a98d0f23adef0e5fd05f96f6bb911e32ec88821a5bc7c47a2799d33fb0706cb2d391ea6e47b3e0eef0d789eb1c0d81c982cfaa991a09822 WHIRLPOOL d7e81340aa1ec46c2b0d36b76e7a1e11ba7d1b39177a8168efe734936e1622808c8997a8cc22f773b9c3e17b51f5861e11eaf7fa89e9b0c61cae937ee7b5fdba
DIST numpy-ref-1.10.1.pdf 5382006 SHA256 72ae03348d0375ff2f18056efd04e815cc1d27b738d0685c80f5204a496bc279 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c WHIRLPOOL d904d9b2824bfb08a0eeffeb37f7d646d003c39230d950d387e2ddc8e475a117b8305a0ce3dc479be72f010b1a868f22ddfde17e6c4cd7c56630bbdf09afb90e
-DIST numpy-ref-1.11.0.pdf 5310792 SHA256 a975923b98f4dbd5a4736ab1c74a1c6393f422e3d1f9184bae2f12f041e3ac3e SHA512 a6bed225428645382846fcd60bc7961a44b0dc24cbfab3b4d0a1cee53092860f9db6226faf6597241ad6b9d6034837aace11214e0fc0c338702a574a9acf28df WHIRLPOOL c8757da7b11e4c47813112870dc96868d7bc6886d9454c0d18c6f8cad12c00a2185288233ffc41b580e9e232a1eaa4a19776055cff017ae56ff483fff0da1af1
DIST numpy-user-1.10.1.pdf 406114 SHA256 5180a5a1333365e474aabba9d6edd25276e79179fd708bb3989d95dc4e76215f SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4 WHIRLPOOL 4b53256663840738d288d38c4151e01ecfb515ebd4f69bb4330f4c5589642b3392a0a300f3def53df6bee8746f127a3af0d284601f288f4c4292df8b6de39f71
-DIST numpy-user-1.11.0.pdf 555403 SHA256 7ea6d24169d9e19d20ff131378d2bb5cd8b41658f242c87a1ffc53c3ac2e4b59 SHA512 8287acea5f6981119dfe223ff9cd2fd14f504b9a70418426ab716b80aea670b30249fbd727664ebf72d6d0660a84a57ff027a42cfe67946a7737a4308eebd786 WHIRLPOOL c72ad351a7f5cbd9c123c9d28c8178c7e463ee74e547a415d65dd6a5854fed090d86f9daa088eb79b48ca40e71d0ced5bc7cf938f631aece1846ae7eea9879b4
diff --git a/dev-python/numpy/files/numpy-1.11.1-no-xlocale.patch b/dev-python/numpy/files/numpy-1.11.1-no-xlocale.patch
deleted file mode 100644
index 59b4378..0000000
--- a/dev-python/numpy/files/numpy-1.11.1-no-xlocale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur numpy-1.11.1.orig/numpy/core/src/multiarray/numpyos.c numpy-1.11.1/numpy/core/src/multiarray/numpyos.c
---- numpy-1.11.1.orig/numpy/core/src/multiarray/numpyos.c 2016-06-25 16:59:40.000000000 -0700
-+++ numpy-1.11.1/numpy/core/src/multiarray/numpyos.c 2016-08-30 13:51:30.607025309 -0700
-@@ -15,7 +15,6 @@
-
- #ifdef HAVE_STRTOLD_L
- #include <stdlib.h>
--#include <xlocale.h>
- #endif
-
-
diff --git a/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch b/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch
deleted file mode 100644
index 9a934cc..0000000
--- a/dev-python/numpy/files/numpy-1.11.2-blas_rec_inc_dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 61e9159569a601315b67c30b6e26bbb2149c0bfa
-Author: Benda Xu <heroxbd@gentoo.org>
-Date: Wed Feb 15 11:17:05 2017 +0900
-
- BUG: blas_info should record include_dirs
-
- blas specified in site.cfg could have non-standard include dirs.
- It should be read and saved in distutils/__config__.py
-
-PR: https://github.com/numpy/numpy/pull/8619
-
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index b8520ac..0fba865 100644
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -1667,6 +1667,8 @@ class blas_info(system_info):
- info = self.check_libs(lib_dirs, blas_libs, [])
- if info is None:
- return
-+ else:
-+ info['include_dirs'] = self.get_include_dirs()
- if platform.system() == 'Windows':
- # The check for windows is needed because has_cblas uses the
- # same compiler that was used to compile Python and msvc is
diff --git a/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch
deleted file mode 100644
index 81d6084..0000000
--- a/dev-python/numpy/files/numpy-1.12.1-no-hardcode-blas.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- numpy-1.11.1/numpy/distutils/system_info.py
-+++ numpy-1.11.1/numpy/distutils/system_info.py
-@@ -312,27 +312,7 @@
- 1 - display warning message
- 2 - raise error
- """
-- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead
-- 'atlas_threads': atlas_threads_info, # ditto
-- 'atlas_blas': atlas_blas_info,
-- 'atlas_blas_threads': atlas_blas_threads_info,
-- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead
-- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto
-- 'atlas_3_10': atlas_3_10_info, # use lapack_opt or blas_opt instead
-- 'atlas_3_10_threads': atlas_3_10_threads_info, # ditto
-- 'atlas_3_10_blas': atlas_3_10_blas_info,
-- 'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
-- 'lapack_atlas_3_10': lapack_atlas_3_10_info, # use lapack_opt instead
-- 'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info, # ditto
-- 'mkl': mkl_info,
-- # openblas which may or may not have embedded lapack
-- 'openblas': openblas_info, # use blas_opt instead
-- # openblas with embedded lapack
-- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead
-- 'blis': blis_info, # use blas_opt instead
-- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead
-- 'blas_mkl': blas_mkl_info, # use blas_opt instead
-- 'x11': x11_info,
-+ cl = {'x11': x11_info,
- 'fft_opt': fft_opt_info,
- 'fftw': fftw_info,
- 'fftw2': fftw2_info,
-@@ -669,10 +650,7 @@
- return [b for b in [a.strip() for a in libs.split(',')] if b]
-
- def get_libraries(self, key='libraries'):
-- if hasattr(self, '_lib_names'):
-- return self.get_libs(key, default=self._lib_names)
-- else:
-- return self.get_libs(key, '')
-+ return self.get_libs(key, '')
-
- def library_extensions(self):
- static_exts = ['.a']
-@@ -1685,7 +1663,7 @@
- lib = self.has_cblas(info)
- if lib is not None:
- info['language'] = 'c'
-- info['libraries'] = [lib]
-+ info['libraries'] = lib
- info['define_macros'] = [('HAVE_CBLAS', None)]
- self.set_info(**info)
-
-@@ -1718,16 +1696,16 @@
- # check for cblas lib, and if not present check for blas lib.
- try:
- c.link_executable(obj, os.path.join(tmpdir, "a.out"),
-- libraries=["cblas"],
-+ libraries=info["libraries"],
- library_dirs=info['library_dirs'],
- extra_postargs=info.get('extra_link_args', []))
-- res = "cblas"
-+ res = info["libraries"]
- except distutils.ccompiler.LinkError:
- c.link_executable(obj, os.path.join(tmpdir, "a.out"),
- libraries=["blas"],
- library_dirs=info['library_dirs'],
- extra_postargs=info.get('extra_link_args', []))
-- res = "blas"
-+ res = ["blas"]
- except distutils.ccompiler.CompileError:
- res = None
- finally:
diff --git a/dev-python/numpy/numpy-1.12.1.ebuild b/dev-python/numpy/numpy-1.12.1.ebuild
deleted file mode 100644
index 1f23adb..0000000
--- a/dev-python/numpy/numpy-1.12.1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs versionator
-
-DOC_PV="1.11.0"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://www.numpy.org/"
-SRC_URI="
- mirror://pypi/${PN:0:1}/${PN}/${P}.zip
- doc? (
- http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
- http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
- http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
- )"
-# It appears the docs haven't been upgraded, still @ 1.11.0
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~sh ~sparc ~x86"
-IUSE="doc lapack test"
-
-RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( app-arch/unzip )
- lapack? ( virtual/pkgconfig )
- test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-no-hardcode-blas.patch
- "${FILESDIR}"/${PN}-1.11.2-blas_rec_inc_dir.patch
- "${FILESDIR}"/${PN}-1.11.1-no-xlocale.patch
-)
-
-src_unpack() {
- default
- if use doc; then
- unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
- fi
-}
-
-pc_incdir() {
- $(tc-getPKG_CONFIG) --cflags-only-I $@ | \
- sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
- $(tc-getPKG_CONFIG) --libs-only-L $@ | \
- sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
- $(tc-getPKG_CONFIG) --libs-only-l $@ | \
- sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
- -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
- | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
- if use lapack; then
- append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
- local libdir="${EPREFIX}"/usr/$(get_libdir)
- cat >> site.cfg <<-EOF || die
- [blas]
- include_dirs = $(pc_incdir cblas)
- library_dirs = $(pc_libdir cblas blas):${libdir}
- blas_libs = $(pc_libs cblas blas)
- [lapack]
- library_dirs = $(pc_libdir lapack):${libdir}
- lapack_libs = $(pc_libs lapack)
- EOF
- else
- export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
- fi
-
- export CC="$(tc-getCC) ${CFLAGS}"
-
- append-flags -fno-strict-aliasing
-
- # See progress in http://projects.scipy.org/scipy/numpy/ticket/573
- # with the subtle difference that we don't want to break Darwin where
- # -shared is not a valid linker argument
- if [[ ${CHOST} != *-darwin* ]]; then
- append-ldflags -shared
- fi
-
- # only one fortran to link with:
- # linking with cblas and lapack library will force
- # autodetecting and linking to all available fortran compilers
- append-fflags -fPIC
- if use lapack; then
- NUMPY_FCONFIG="config_fc --noopt --noarch"
- # workaround bug 335908
- [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
- fi
-
- # don't version f2py, we will handle it.
- sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
- # we don't have f2py-3.3
- sed \
- -e 's:test_f2py:_&:g' \
- -i numpy/tests/test_scripts.py || die
-
- # QA bug 590464
- # The .py files from numpy/core/tests are just added, instead
- # of being bytecode compiled as a proper subdir package.
- # We trick the buildsystem into accepting it as a bytecode
- # package by adding a setup.py and an empty __init__.py
- #cp numpy/{compat/setup.py,core/tests} || die
- #touch numpy/core/tests/__init__.py || die
- #sed \
- # -e 's:compat:tests:' \
- # -i numpy/core/tests/setup.py || die
- #sed \
- # -e "s:config\.add_data_dir('tests'):config\.add_subpackage('tests'):" \
- # -i numpy/core/setup.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- distutils-r1_python_compile \
- $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
- ${NUMPY_FCONFIG}
-}
-
-python_test() {
- distutils_install_for_testing --single-version-externally-managed --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
- cd "${TMPDIR}" || die
-
- ${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
- distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
- DOCS+=( THANKS.txt )
-
- if use doc; then
- HTML_DOCS=( "${WORKDIR}"/html/. )
- DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
- fi
-
- distutils-r1_python_install_all
-
- docinto f2py
- dodoc doc/f2py/*.txt
- doman doc/f2py/f2py.1
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-03-29 19:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-29 19:51 [gentoo-commits] proj/musl:master commit in: dev-python/numpy/files/, dev-python/numpy/ Aric Belsito
-- strict thread matches above, loose matches on Subject: below --
2017-04-14 23:43 Aric Belsito
2017-02-28 18:20 Aric Belsito
2016-11-09 4:22 Aric Belsito
2016-02-03 5:14 Anthony G. Basile
2016-01-03 16:51 Jory Pratt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox