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 <jjhel...@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/. )
