diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/numpy | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.xz |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/numpy')
-rw-r--r-- | dev-python/numpy/Manifest | 15 | ||||
-rw-r--r-- | dev-python/numpy/files/numpy-1.8.0-f2py-insecure-temporary.patch | 214 | ||||
-rw-r--r-- | dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch | 25 | ||||
-rw-r--r-- | dev-python/numpy/files/numpy-1.9.0-OO.patch | 91 | ||||
-rw-r--r-- | dev-python/numpy/files/numpy-1.9.0-no-hardcode-blas.patch | 25 | ||||
-rw-r--r-- | dev-python/numpy/files/numpy-1.9.2-no-hardcode-blas.patch | 35 | ||||
-rw-r--r-- | dev-python/numpy/metadata.xml | 17 | ||||
-rw-r--r-- | dev-python/numpy/numpy-1.8.0-r1.ebuild | 147 | ||||
-rw-r--r-- | dev-python/numpy/numpy-1.8.1.ebuild | 145 | ||||
-rw-r--r-- | dev-python/numpy/numpy-1.8.2.ebuild | 145 | ||||
-rw-r--r-- | dev-python/numpy/numpy-1.9.0-r1.ebuild | 148 | ||||
-rw-r--r-- | dev-python/numpy/numpy-1.9.0.ebuild | 146 | ||||
-rw-r--r-- | dev-python/numpy/numpy-1.9.1.ebuild | 146 | ||||
-rw-r--r-- | dev-python/numpy/numpy-1.9.2.ebuild | 146 |
14 files changed, 1445 insertions, 0 deletions
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest new file mode 100644 index 00000000000..dcd56be3c27 --- /dev/null +++ b/dev-python/numpy/Manifest @@ -0,0 +1,15 @@ +DIST numpy-1.8.0.tar.gz 3779617 SHA256 2764d0819acc77e9ff81b060fe7f69530b0d85c26ac9d162639b787cb227d253 SHA512 ec3d002ed786335e8748983261c96f88a9f1520fc345ad5b810dc02a5e126e15fe5afb02bed1f4b43d580a1da39583d86b84f57dc456b0702653e34e5357c857 WHIRLPOOL 8796d90795ddec62e6d72be433ea00917a63ef39cf3fe81e094f653e1863b69ecdce812995877f78e4324434141b03e2ceb3f872ed4e023b19c6bd9bcc294ac2 +DIST numpy-1.8.1.tar.gz 3794076 SHA256 3d722fc3ac922a34c50183683e828052cd9bb7e9134a95098441297d7ea1c7a9 SHA512 39ef9e13f8681a2c2ba3d74ab96fd28c5669e653308fd1549f262921814fa7c276ce6d9fb65ef135006584c608bdf3db198d43f66c9286fc7b3c79803dbc1f57 WHIRLPOOL 10615c0c70c153156034447e9c3f2b70b0259173a44af3b5cc641dd31c0af71ef1053a9cc7938deff5edb899ae2666b2b3109491d7394f03d1a81cb19722d398 +DIST numpy-1.8.2.tar.gz 3792998 SHA256 6d487fc724780d66746bde264ea71f5cd77d3a39e52ee2b073dcaed63bc669db SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c WHIRLPOOL 0d3a05b1e3c0a1ceb0a7b4818406dbb45506e5f25bc2727d4ff44cc0a0520e6556b3c68ae24dbca37ba9d67ae2defbb3ff9c906d4c2635b29ed44452d70e8311 +DIST numpy-1.9.0.tar.gz 3962108 SHA256 2745b1d64445da3c29a34450320025c11897ae4af77475f861966e98b2cb1a0f SHA512 dc9fb453367bd429336ed7391c0923d0d3af5f8ab26ef8681bc1a9e934ac28e2c9bc30e11f1026c2ea5710a3c4e27188007ee14b194bfca6a03228fad8f3d2fd WHIRLPOOL 5111f5cbb43bd279587f858196fbe86103abde7e8d6536337af51fe4a8371d39057d9ea75ac73ab501ff5c07c5c6e7e4e62f660ca263181e2fee3e6e61718ba9 +DIST numpy-1.9.1.tar.gz 3978007 SHA256 0075bbe07e30b659ae4415446f45812dc1b96121a493a4a1f8b1ba77b75b1e1c SHA512 8286a55f4bd5f9c16b1252ee64a644fe4a03758d31ef2e16714c2f5c61d96f766fb6ffc98986c58e1db1c2b812a2d10e89eae3442263615e46472418c2d4edd4 WHIRLPOOL 9025fee798b2e0b23af4c5870fd12606de65c91a176e2900ca93ed853767165dfbe7344125aba19a58d031f82880d6347095070ed3585deb8866819c32422751 +DIST numpy-1.9.2.tar.gz 3986067 SHA256 325e5f2b0b434ecb6e6882c7e1034cc6cdde3eeeea87dbc482575199a6aeef2a SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9 WHIRLPOOL 59f5dc52cb95c7ce80fec3a7feac6cfda1d149596bf6d95c18bd8314e31a8df494b2b470c4cc3d8c296c9fc11c718d70d5b9b5344337175ca75496504c0fd201 +DIST numpy-html-1.8.0.zip 9779825 SHA256 39e853c1aaa711976333782f465f2579ca66e6698393f6ba79f5cc78317b1203 SHA512 33333c48a3f4d27ccddf6696dce4e346f8729d1f398128b3bfebb8a9d53ded7bb62b63a766319f6e49ba7cf8ca4e1ce252996acd263976ad2990bf9650d71043 WHIRLPOOL 7eea0ad3418c55d6104a4a115fcdcd5eeb291b9fc1237724e10dcbbf95bc7a4a23b519c64976ac405fb4c5abbaae87a6c747f9ad695d08b6326b459ba1fb8a15 +DIST numpy-html-1.8.1.zip 9703711 SHA256 f7fc3af4dba7b40deabd1828a86ea2e2eb5b9fa17c7ebddd73ee4cb8625105b1 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071 WHIRLPOOL e502b1416bad4b189773ba98035dfbeed0dc251d8f9b76e336450f14e8425caf92d55d2b1c2cc5ef9eb2d33eb2bf7cd55e720c1b265e45539b195fea1d7f046c +DIST numpy-html-1.9.1.zip 9839137 SHA256 12a24937f8273fcf79090c99b6c4154a0ecfc378386498cf2afe727ea171407c SHA512 647a6be9f93995aca14185e283a2b412678c6e8080fe4f14e7cc9ee63c28eebb64dea6bbe28f30ef6850a5565dd1e06928fd660ac762e9a91454d309eff96ed4 WHIRLPOOL 68c367fd0416d27b1cf43edf7ca48bc8845c02856bbbacdf63c88fe8bbffd5dd86fb3e5cdea8f669dd78adf7bcc4d184953048783802df323126c1b22baf8e92 +DIST numpy-ref-1.8.0.pdf 5324229 SHA256 49ecb1d768eb48598439cc63058f830ca3522fe1cfeba1a321086e9820ae8911 SHA512 d89314215c4adefa487b3e46b2babeda7739ee193fef821846d4df0089fabf2167b47dd2990b6bd423432f75238547548924622c6f3b9a90a36d578450001eb2 WHIRLPOOL 3bb12c719cbe4734014774f1bfc3f98af544ee2c407adb2e3ee988e2b1035ad0ef711eaa68168656be7b034df2db76c8789daa2940a048b4a6cb3af0bb0eca68 +DIST numpy-ref-1.8.1.pdf 5348248 SHA256 973851e66d0d5ab095f444f8aeb966fefe2dd544226395abbb110fc1b60f351d SHA512 340dd8f47430f24fea81bb3a8674e1a58f4290a9d1c5d64bac96d50b31a94a770e78381e42daf8b0a6a90cefe5cafe86b0c89f7cc7635a042a7e85eb74bdbdf5 WHIRLPOOL be13f88bb68944186c564a5c3789daededade240a26e7fb61c980a090249ab3a5b1f40805e97214168fbf0c099fb6b12d981ff313bace572f130023b29e7aaa7 +DIST numpy-ref-1.9.1.pdf 5318122 SHA256 3c8e5881a3460e1cc9da95fe2167044e8f832ab8e980c3606d1f353e7ac6dcee SHA512 5171bb22588117a53e0eac355520581f7817a7e7a099ae83bb73f2ac8248a60e139ae9719dc543b44f25ccf8319c9f149fec1bf5aa55d943fad06a8e6da0d9ba WHIRLPOOL 5c99daf3ae2e6bf235aed287682f1b96d5b6afc9d290f544a8baab892b39c9f6dd9f649abe3e103cc90c990d87e4d653d8157d774a8bd35eccc9cc6ac7a870f9 +DIST numpy-user-1.8.0.pdf 408447 SHA256 a8c30360f9e46c63cfdf48fa594971d94d68ce59ece08c13d4acde8b14032cfe SHA512 10293dba45377c6f1024125a49810b01e388eb33a3e8ed75b8ec39c2b93e53878cbe62e6b7adbf1e957dc47ef253e20304afa7d86d798fb5198887cbe618131f WHIRLPOOL 70cc5a5e97a919bb027f92ac87127fb1bc08d06e2a131c4b413837e76d8feab9b65d7dc9e95b6e797d057efb6abf0d2b3e7562ee3cd140b1ff1418bad5475335 +DIST numpy-user-1.8.1.pdf 408305 SHA256 be827f2d92ef86c3af7f59c623017e7bc23ee95c64f88e8c9871f3ad1f99b262 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c WHIRLPOOL bf4105093b208b35b1914e842821b8d289b46eb28f1fda110643f5970bbfafe801e9d148c5f535b43eba9a23e09d333e3aecd9a55b33e64827883d253477d19a +DIST numpy-user-1.9.1.pdf 418111 SHA256 e1f6baed0b73f3d4b106c88924c083f9a519e860c1beb718830bf1aee1892232 SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45 WHIRLPOOL f93ed20c5da7b379e3afcafab97c7eb60231ed4f73cebf18184e00b9a8a5a531fa32992f7f28f16d2714b3056c61153c29267c8c6b93cb100e06f53bced1bd6a diff --git a/dev-python/numpy/files/numpy-1.8.0-f2py-insecure-temporary.patch b/dev-python/numpy/files/numpy-1.8.0-f2py-insecure-temporary.patch new file mode 100644 index 00000000000..5a68e8e2aa9 --- /dev/null +++ b/dev-python/numpy/files/numpy-1.8.0-f2py-insecure-temporary.patch @@ -0,0 +1,214 @@ + numpy/core/tests/test_memmap.py | 34 ++++++++++++++++------------------ + numpy/core/tests/test_multiarray.py | 9 +++------ + numpy/f2py/__init__.py | 22 +++++++++++----------- + numpy/f2py/f2py2e.py | 4 ++-- + numpy/lib/tests/test_io.py | 24 ++++++++++++++++-------- + 5 files changed, 48 insertions(+), 45 deletions(-) + +diff --git a/numpy/core/tests/test_memmap.py b/numpy/core/tests/test_memmap.py +index 6de6319..10e7a08 100644 +--- a/numpy/core/tests/test_memmap.py ++++ b/numpy/core/tests/test_memmap.py +@@ -1,7 +1,7 @@ + from __future__ import division, absolute_import, print_function + + import sys +-from tempfile import NamedTemporaryFile, TemporaryFile, mktemp ++from tempfile import NamedTemporaryFile, TemporaryFile + import os + + from numpy import memmap +@@ -33,12 +33,11 @@ class TestMemmap(TestCase): + assert_array_equal(self.data, newfp) + + def test_open_with_filename(self): +- tmpname = mktemp('', 'mmap') +- fp = memmap(tmpname, dtype=self.dtype, mode='w+', +- shape=self.shape) +- fp[:] = self.data[:] +- del fp +- os.unlink(tmpname) ++ with NamedTemporaryFile() as tmp: ++ fp = memmap(tmp.name, dtype=self.dtype, mode='w+', ++ shape=self.shape) ++ fp[:] = self.data[:] ++ del fp + + def test_unnamed_file(self): + with TemporaryFile() as f: +@@ -55,17 +54,16 @@ class TestMemmap(TestCase): + del fp + + def test_filename(self): +- tmpname = mktemp('', 'mmap') +- fp = memmap(tmpname, dtype=self.dtype, mode='w+', +- shape=self.shape) +- abspath = os.path.abspath(tmpname) +- fp[:] = self.data[:] +- self.assertEqual(abspath, fp.filename) +- b = fp[:1] +- self.assertEqual(abspath, b.filename) +- del b +- del fp +- os.unlink(tmpname) ++ with NamedTemporaryFile() as tmp: ++ fp = memmap(tmp.name, dtype=self.dtype, mode='w+', ++ shape=self.shape) ++ abspath = os.path.abspath(tmp.name) ++ fp[:] = self.data[:] ++ self.assertEqual(abspath, fp.filename) ++ b = fp[:1] ++ self.assertEqual(abspath, b.filename) ++ del b ++ del fp + + def test_filename_fileobj(self): + fp = memmap(self.tmpfp, dtype=self.dtype, mode="w+", +diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py +index a0c4bcf..37b9931 100644 +--- a/numpy/core/tests/test_multiarray.py ++++ b/numpy/core/tests/test_multiarray.py +@@ -2051,12 +2051,11 @@ class TestIO(object): + self.x = rand(shape) + rand(shape).astype(np.complex)*1j + self.x[0,:, 1] = [nan, inf, -inf, nan] + self.dtype = self.x.dtype +- self.filename = tempfile.mktemp() ++ self.file = tempfile.NamedTemporaryFile() ++ self.filename = self.file.name + + def tearDown(self): +- if os.path.isfile(self.filename): +- os.unlink(self.filename) +- #tmp_file.close() ++ self.file.close() + + def test_bool_fromstring(self): + v = np.array([True, False, True, False], dtype=np.bool_) +@@ -2084,7 +2083,6 @@ class TestIO(object): + y = np.fromfile(f, dtype=self.dtype) + f.close() + assert_array_equal(y, self.x.flat) +- os.unlink(self.filename) + + def test_roundtrip_filename(self): + self.x.tofile(self.filename) +@@ -2217,7 +2215,6 @@ class TestIO(object): + s = f.read() + f.close() + assert_equal(s, '1.51,2.0,3.51,4.0') +- os.unlink(self.filename) + + def test_tofile_format(self): + x = np.array([1.51, 2, 3.51, 4], dtype=float) +diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py +index ccdbd4e..fcfd185 100644 +--- a/numpy/f2py/__init__.py ++++ b/numpy/f2py/__init__.py +@@ -28,20 +28,20 @@ def compile(source, + from numpy.distutils.exec_command import exec_command + import tempfile + if source_fn is None: +- fname = os.path.join(tempfile.mktemp()+'.f') ++ f = tempfile.NamedTemporaryFile(suffix='.f') + else: +- fname = source_fn +- +- f = open(fname, 'w') +- f.write(source) +- f.close() +- +- args = ' -c -m %s %s %s'%(modulename, fname, extra_args) +- c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' %(sys.executable, args) +- s, o = exec_command(c) +- if source_fn is None: +- try: os.remove(fname) +- except OSError: pass ++ f = open(source_fn, 'w') ++ ++ try: ++ f.write(source) ++ f.flush() ++ ++ args = ' -c -m %s %s %s'%(modulename, f.name, extra_args) ++ c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' % \ ++ (sys.executable, args) ++ s, o = exec_command(c) ++ finally: ++ f.close() + return s + + from numpy.testing import Tester +diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py +old mode 100755 +new mode 100644 +index 011b430..b264ea3 +--- a/numpy/f2py/f2py2e.py ++++ b/numpy/f2py/f2py2e.py +@@ -91,7 +91,7 @@ Options: + --lower is assumed with -h key, and --no-lower without -h key. + + --build-dir <dirname> All f2py generated files are created in <dirname>. +- Default is tempfile.mktemp(). ++ Default is tempfile.mkdtemp(). + + --overwrite-signature Overwrite existing signature file. + +@@ -428,7 +428,7 @@ def run_compile(): + del sys.argv[i] + else: + remove_build_dir = 1 +- build_dir = os.path.join(tempfile.mktemp()) ++ build_dir = tempfile.mkdtemp() + + _reg1 = re.compile(r'[-][-]link[-]') + sysinfo_flags = [_m for _m in sys.argv[1:] if _reg1.match(_m)] +diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py +index fdd78b2..caffada 100644 +--- a/numpy/lib/tests/test_io.py ++++ b/numpy/lib/tests/test_io.py +@@ -4,7 +4,9 @@ import sys + import gzip + import os + import threading +-from tempfile import mkstemp, mktemp, NamedTemporaryFile ++import shutil ++import contextlib ++from tempfile import mkstemp, mkdtemp, NamedTemporaryFile + import time + import warnings + import gc +@@ -21,6 +23,12 @@ from numpy.ma.testutils import (TestCase, assert_equal, assert_array_equal, + assert_raises, run_module_suite) + from numpy.testing import assert_warns, assert_, build_err_msg + ++@contextlib.contextmanager ++def tempdir(change_dir=False): ++ tmpdir = mkdtemp() ++ yield tmpdir ++ shutil.rmtree(tmpdir) ++ + + class TextIO(BytesIO): + """Helper IO class. +@@ -145,14 +153,14 @@ class TestSavezLoad(RoundtripTest, TestCase): + @np.testing.dec.slow + def test_big_arrays(self): + L = (1 << 31) + 100000 +- tmp = mktemp(suffix='.npz') + a = np.empty(L, dtype=np.uint8) +- np.savez(tmp, a=a) +- del a +- npfile = np.load(tmp) +- a = npfile['a'] +- npfile.close() +- os.remove(tmp) ++ with tempdir() as tmpdir: ++ tmp = os.path.join(tmpdir, "file.npz") ++ np.savez(tmp, a=a) ++ del a ++ npfile = np.load(tmp) ++ a = npfile['a'] ++ npfile.close() + + def test_multiple_arrays(self): + a = np.array([[1, 2], [3, 4]], float) diff --git a/dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch new file mode 100644 index 00000000000..eaf30dd8e13 --- /dev/null +++ b/dev-python/numpy/files/numpy-1.8.0-no-hardcode-blas.patch @@ -0,0 +1,25 @@ +patch to allow any blas (c or f77) to simulate the +special treatment atlas libs have in numpy. +2013: numpy.distutils still horrendous code + +--- numpy/distutils/system_info.py.orig 2013-11-25 19:54:45.760217851 -0800 ++++ numpy/distutils/system_info.py 2013-11-25 20:00:26.575310888 -0800 +@@ -293,17 +293,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 +- 'mkl': mkl_info, +- 'openblas': openblas_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/files/numpy-1.9.0-OO.patch b/dev-python/numpy/files/numpy-1.9.0-OO.patch new file mode 100644 index 00000000000..f1ebc23e157 --- /dev/null +++ b/dev-python/numpy/files/numpy-1.9.0-OO.patch @@ -0,0 +1,91 @@ +From dc453917978e98dcdf3bbc106b080c80f0a1301e Mon Sep 17 00:00:00 2001 +From: Charles Harris <charlesr.harris@gmail.com> +Date: Fri, 3 Oct 2014 20:03:31 -0600 +Subject: [PATCH] BUG: Make numpy import when run with Python flag '-OO'. + +This consists of checking for a docstring equal to None and skipping two +tests that require docstrings. + +Closes #5148. +--- + numpy/lib/tests/test_function_base.py | 6 +++++- + numpy/lib/tests/test_utils.py | 3 ++- + numpy/ma/extras.py | 8 +++++--- + 3 files changed, 12 insertions(+), 5 deletions(-) + +diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py +index ee38b35..a3f8056 100644 +--- a/numpy/lib/tests/test_function_base.py ++++ b/numpy/lib/tests/test_function_base.py +@@ -1,12 +1,14 @@ + from __future__ import division, absolute_import, print_function + + import warnings ++import sys + + import numpy as np + from numpy.testing import ( + run_module_suite, TestCase, assert_, assert_equal, assert_array_equal, + assert_almost_equal, assert_array_almost_equal, assert_raises, +- assert_allclose, assert_array_max_ulp, assert_warns, assert_raises_regex ++ assert_allclose, assert_array_max_ulp, assert_warns, ++ assert_raises_regex, dec + ) + from numpy.random import rand + from numpy.lib import * +@@ -2094,6 +2096,8 @@ def test_string_arg(self): + + + class TestAdd_newdoc(TestCase): ++ ++ @dec.skipif(sys.flags.optimize == 2) + def test_add_doc(self): + # test np.add_newdoc + tgt = "Current flat index into the array." +diff --git a/numpy/lib/tests/test_utils.py b/numpy/lib/tests/test_utils.py +index fcb37f9..8fbd1c4 100644 +--- a/numpy/lib/tests/test_utils.py ++++ b/numpy/lib/tests/test_utils.py +@@ -3,7 +3,7 @@ + import sys + from numpy.core import arange + from numpy.testing import ( +- run_module_suite, assert_, assert_equal ++ run_module_suite, assert_, assert_equal, dec + ) + from numpy.lib import deprecate + import numpy.lib.utils as utils +@@ -14,6 +14,7 @@ + from StringIO import StringIO + + ++@dec.skipif(sys.flags.optimize == 2) + def test_lookfor(): + out = StringIO() + utils.lookfor('eigenvalue', module='numpy', output=out, +diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py +index 82a61a6..a993fd0 100644 +--- a/numpy/ma/extras.py ++++ b/numpy/ma/extras.py +@@ -434,8 +434,10 @@ def apply_over_axes(func, a, axes): + raise ValueError("function is not returning " + "an array of the correct shape") + return val +-apply_over_axes.__doc__ = np.apply_over_axes.__doc__[ +- :np.apply_over_axes.__doc__.find('Notes')].rstrip() + \ ++ ++if apply_over_axes.__doc__ is not None: ++ apply_over_axes.__doc__ = np.apply_over_axes.__doc__[ ++ :np.apply_over_axes.__doc__.find('Notes')].rstrip() + \ + """ + + Examples +@@ -462,7 +464,7 @@ def apply_over_axes(func, a, axes): + [[[46] + [--] + [124]]] +-""" ++ """ + + + def average(a, axis=None, weights=None, returned=False): diff --git a/dev-python/numpy/files/numpy-1.9.0-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.9.0-no-hardcode-blas.patch new file mode 100644 index 00000000000..128ea1391dd --- /dev/null +++ b/dev-python/numpy/files/numpy-1.9.0-no-hardcode-blas.patch @@ -0,0 +1,25 @@ +--- numpy/distutils/system_info.py 2014-09-07 08:57:47.000000000 +0000 ++++ numpy/distutils/system_info.py 2014-10-19 17:57:12.099448481 +0000 +@@ -296,20 +296,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 +- '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/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 00000000000..674dbfadbf0 --- /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/metadata.xml b/dev-python/numpy/metadata.xml new file mode 100644 index 00000000000..0bfafa1af2f --- /dev/null +++ b/dev-python/numpy/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>sci</herd> + <herd>python</herd> + <longdescription lang="en"> + NumPy is a general-purpose array-processing Python package designed to + efficiently manipulate large multi-dimensional arrays of arbitrary + records without sacrificing too much speed for small multi-dimensional + arrays. There are also basic facilities for discrete fourier transform, + basic linear algebra and random number generation. + It is the successor of Numeric and numarray. +</longdescription> + <upstream> + <remote-id type="pypi">numpy</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/numpy/numpy-1.8.0-r1.ebuild b/dev-python/numpy/numpy-1.8.0-r1.ebuild new file mode 100644 index 00000000000..e01e6de8052 --- /dev/null +++ b/dev-python/numpy/numpy-1.8.0-r1.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +FORTRAN_NEEDED=lapack + +inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator + +DOC_PV="${PV}" + +DESCRIPTION="Fast array and numerical python library" +HOMEPAGE="http://numpy.scipy.org/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz + doc? ( + http://docs.scipy.org/doc/${P}/${PN}-html-${DOC_PV}.zip + http://docs.scipy.org/doc/${P}/${PN}-ref-${DOC_PV}.pdf + http://docs.scipy.org/doc/${P}/${PN}-user-${DOC_PV}.pdf + )" + +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-0.10[${PYTHON_USEDEP}] )" + +# Uses distutils.command.config. +DISTUTILS_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${P}-no-hardcode-blas.patch + "${FILESDIR}"/${P}-f2py-insecure-temporary.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 + + distutils-r1_python_prepare_all +} + +python_compile() { + distutils-r1_python_compile ${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 + + docinto f2py + dodoc numpy/f2py/docs/*.txt + doman numpy/f2py/f2py.1 + + if use doc; then + dohtml -r "${WORKDIR}"/html/* + insinto /usr/share/doc/${PF} + doins "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf + fi +} diff --git a/dev-python/numpy/numpy-1.8.1.ebuild b/dev-python/numpy/numpy-1.8.1.ebuild new file mode 100644 index 00000000000..7769eb5f1a4 --- /dev/null +++ b/dev-python/numpy/numpy-1.8.1.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +FORTRAN_NEEDED=lapack + +inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator + +DOC_PV="${PV}" + +DESCRIPTION="Fast array and numerical python library" +HOMEPAGE="http://numpy.scipy.org/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz + doc? ( + http://docs.scipy.org/doc/${P}/${PN}-html-${DOC_PV}.zip + http://docs.scipy.org/doc/${P}/${PN}-ref-${DOC_PV}.pdf + http://docs.scipy.org/doc/${P}/${PN}-user-${DOC_PV}.pdf + )" + +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[${PYTHON_USEDEP}] )" + +# Uses distutils.command.config. +DISTUTILS_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.0-no-hardcode-blas.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 + + distutils-r1_python_prepare_all +} + +python_compile() { + distutils-r1_python_compile ${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 + + docinto f2py + dodoc numpy/f2py/docs/*.txt + doman numpy/f2py/f2py.1 +} diff --git a/dev-python/numpy/numpy-1.8.2.ebuild b/dev-python/numpy/numpy-1.8.2.ebuild new file mode 100644 index 00000000000..3ca3e504c42 --- /dev/null +++ b/dev-python/numpy/numpy-1.8.2.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +FORTRAN_NEEDED=lapack + +inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator + +DOC_PV="1.8.1" +DOC_P="${PN}-${DOC_PV}" + +DESCRIPTION="Fast array and numerical python library" +HOMEPAGE="http://numpy.scipy.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[${PYTHON_USEDEP}] )" + +# Uses distutils.command.config. +DISTUTILS_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.0-no-hardcode-blas.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 + + distutils-r1_python_prepare_all +} + +python_compile() { + distutils-r1_python_compile ${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 + + docinto f2py + dodoc numpy/f2py/docs/*.txt + doman numpy/f2py/f2py.1 +} diff --git a/dev-python/numpy/numpy-1.9.0-r1.ebuild b/dev-python/numpy/numpy-1.9.0-r1.ebuild new file mode 100644 index 00000000000..fa61e78e11e --- /dev/null +++ b/dev-python/numpy/numpy-1.9.0-r1.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +FORTRAN_NEEDED=lapack + +inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator + +DOC_PV="1.8.1" +DOC_P="${PN}-${DOC_PV}" + +DESCRIPTION="Fast array and numerical python library" +HOMEPAGE="http://numpy.scipy.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[${PYTHON_USEDEP}] )" + +# Uses distutils.command.config. +DISTUTILS_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${PN}-1.9.0-no-hardcode-blas.patch + # https://github.com/numpy/numpy/commit/dc453917978e98dcdf3bbc106b080c80f0a1301e.patch + "${FILESDIR}"/${PN}-1.9.0-OO.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 + + distutils-r1_python_prepare_all +} + +python_compile() { + distutils-r1_python_compile ${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 +} diff --git a/dev-python/numpy/numpy-1.9.0.ebuild b/dev-python/numpy/numpy-1.9.0.ebuild new file mode 100644 index 00000000000..12415c46b07 --- /dev/null +++ b/dev-python/numpy/numpy-1.9.0.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +FORTRAN_NEEDED=lapack + +inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator + +DOC_PV="1.8.1" +DOC_P="${PN}-${DOC_PV}" + +DESCRIPTION="Fast array and numerical python library" +HOMEPAGE="http://numpy.scipy.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[${PYTHON_USEDEP}] )" + +# Uses distutils.command.config. +DISTUTILS_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${PN}-1.9.0-no-hardcode-blas.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 + + distutils-r1_python_prepare_all +} + +python_compile() { + distutils-r1_python_compile ${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 +} diff --git a/dev-python/numpy/numpy-1.9.1.ebuild b/dev-python/numpy/numpy-1.9.1.ebuild new file mode 100644 index 00000000000..12415c46b07 --- /dev/null +++ b/dev-python/numpy/numpy-1.9.1.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +FORTRAN_NEEDED=lapack + +inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator + +DOC_PV="1.8.1" +DOC_P="${PN}-${DOC_PV}" + +DESCRIPTION="Fast array and numerical python library" +HOMEPAGE="http://numpy.scipy.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[${PYTHON_USEDEP}] )" + +# Uses distutils.command.config. +DISTUTILS_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${PN}-1.9.0-no-hardcode-blas.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 + + distutils-r1_python_prepare_all +} + +python_compile() { + distutils-r1_python_compile ${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 +} diff --git a/dev-python/numpy/numpy-1.9.2.ebuild b/dev-python/numpy/numpy-1.9.2.ebuild new file mode 100644 index 00000000000..865164f1831 --- /dev/null +++ b/dev-python/numpy/numpy-1.9.2.ebuild @@ -0,0 +1,146 @@ +# 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} ) + +FORTRAN_NEEDED=lapack + +inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator + +DOC_PV="1.9.1" +DOC_P="${PN}-${DOC_PV}" + +DESCRIPTION="Fast array and numerical python library" +HOMEPAGE="http://numpy.scipy.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[${PYTHON_USEDEP}] )" + +# Uses distutils.command.config. +DISTUTILS_IN_SOURCE_BUILD=1 + +PATCHES=( + "${FILESDIR}"/${P}-no-hardcode-blas.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 + + distutils-r1_python_prepare_all +} + +python_compile() { + distutils-r1_python_compile ${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 +} |