Updated to python 3.6

f0fdde47 · José María Fernández · 6733a764 · f0fdde47 · f0fdde47 · f0fdde47
Commit f0fdde47 authored Aug 10, 2018 by José María Fernández
5 changed files
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
-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 BLAKE2B 436ab4185212f8eeaa3d61e29c2c547c9f24bf0869984cc674e66a7360177e999cc70a6573316711e478db62057d5cee90f85b978d095c6b47f1dc3832ffbdf7 SHA512 9d1f3619b801c88604a0495290da4ae8cfb4800257d549214363c554c1dc09a736425d594ed88f492afee6ae7c68fe5c166b9b3a8f24637ea41d67fd23b9d9f9
-DIST numpy-ref-1.10.1.pdf 5382006 BLAKE2B c360d40c6ac3d2975a760dcf32ed312f30e9ee6b096020e0513bb22af600de62f5f72309603414b3bbcaf02a1aacd79e84545a6e5d50611bfdabafa9f6441a10 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c
-DIST numpy-user-1.10.1.pdf 406114 BLAKE2B 88d43e87071eb88223c84720001671677c6f8c1e745b4434331434a9c48cee4591e67740ef102e49e839e4b2aa690798a5415fa25eaa79d823dbcfa29780fa85 SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4
-EBUILD numpy-1.10.4-r1.ebuild 4067 SHA256 d01922f74d1d2185cb4fec6a3bee715a17581a759b83e665468c884995f2934d SHA512 8681790f986e1e31d4aa3a7f1e89335d94c379cd1b186f12f24abcbed8e42afb55f5879ba7487c7d3e521bdc3ab63c228cdb81b9e1a02dec4609df1bf0c5a0de WHIRLPOOL bc2e357a1ec9d1a31f72358c3c599fc4fbbbeffce84f03e5d7b5f870c4c71de4b57e46cbbaac28dc8740391cd586f094b57920182366d6d3fe3d253964a720d9
+AUX numpy-1.11.1-no-hardcode-blas.patch 3403 BLAKE2B a70d60a0f0b9bea3c24818c46ee243c07bf35e053327d9303ef043a69dca5fb0e738cee5896a06551ef506690b79a2bf33dfb7c1036fc33befdbb7d7f75db31a SHA512 0b32bf8e6fe08d139a589f5ca6a6d7d80716712f3cebcd84574ba5e90b283df84765d492f18e1fe3712aec6dbd6881a1b03e157e1cd6d42d6cd37022a62597aa
+AUX numpy-1.11.2-import-module-fix.patch 932 BLAKE2B a65c7cf8e43218fde178921b8380fac80746eebbc141846aeae1bd46c7b0bfd83083d55ccbc924f7f26db0ccc5fa6b06928039743c6b7fff5acf55cdb908081a SHA512 5f4b72cbab6a577490b029f3be5cbdacb0f161a26c20a37e1c924e5a9ba6403098de85cf578567292b31eb0a07c9f5ac6053f12c623e00e26605b6cc2f67ffe3
+DIST numpy-1.11.2.tar.gz 4178447 BLAKE2B c3d7b3e9dced3a2a6f42ffd79f3cd04015e41cd0088150765078d241615d5b21f1d9f2c16b59081345bc7a174f1614f0acb6066ea9f73c65a2fe94a30e7d701e SHA512 c1818de5c8b92cc2a673149f090cc863b484afd29e8a014ffcf8d0f5e70cf8886c7662dbe45847712dec8ae0412d1cb48b13cceefe3e4ec0e85bb20e4beaa46e
+DIST numpy-html-1.11.0.zip 9879611 BLAKE2B 01f9fefcb71fe22d694af6a117da19e79c983c0f68f9e81fd060f4cb6dec6d13ba8e2354ed6040da58796a05c5a05dbecc595fbae2d578191ab4bb22f0dace4d SHA512 7bf416030c273c767a98d0f23adef0e5fd05f96f6bb911e32ec88821a5bc7c47a2799d33fb0706cb2d391ea6e47b3e0eef0d789eb1c0d81c982cfaa991a09822
+DIST numpy-ref-1.11.0.pdf 5310792 BLAKE2B 068e6fed91fe15dc9a77bcc50b32b8727fb98ead513f50d4938bc5c09b1c5bcd4e9fd9701cd1b9bf38656692d15f1b98b07801f8b73e1782a8e216f7e15773b8 SHA512 a6bed225428645382846fcd60bc7961a44b0dc24cbfab3b4d0a1cee53092860f9db6226faf6597241ad6b9d6034837aace11214e0fc0c338702a574a9acf28df
+DIST numpy-user-1.11.0.pdf 555403 BLAKE2B c659a0d8d0587396c9bbf8fbe3ebaf5cb7311f46e99f0e0944efc96e9c38dd3c60fef6346ae1662b923c39955e0c662ec1993b0b2904f04888b2b3d0009b044b SHA512 8287acea5f6981119dfe223ff9cd2fd14f504b9a70418426ab716b80aea670b30249fbd727664ebf72d6d0660a84a57ff027a42cfe67946a7737a4308eebd786
+EBUILD numpy-1.11.2-r2.ebuild 4788 BLAKE2B 6a25aa37605bd864b90c9f50e305562eb6a7036a9e210c70cd4c3e378dd099f58eec60093cf512f8286f918b082df2dc8ca86162d38018bcd32e806bb74f8b9d SHA512 d2bb67be5ec5b26cfa4b0592997196e5060b2e27680765ae8631da74bc7b0f8e3328225ce40e72d10ac33787a85978bc3a903d39051837609c6ae9a066f8c25c
+MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
--- 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
- 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):
+--- 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
     """
@@ -33,7 +28,19 @@ index d7eb49e..aa62b09 100644
           'fft_opt': fft_opt_info,
           'fftw': fftw_info,
           'fftw2': fftw2_info,
-@@ -1690,7 +1671,7 @@ class blas_info(system_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'
@@ -42,7 +49,7 @@ index d7eb49e..aa62b09 100644
                 info['define_macros'] = [('HAVE_CBLAS', None)]
         self.set_info(**info)
 
-@@ -1722,16 +1703,16 @@ class blas_info(system_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"),

--- 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
+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):
--- a/dev-python/numpy/metadata.xml
+++ b/dev-python/numpy/metadata.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <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>
--- a/dev-python/numpy/numpy-1.10.4-r1.ebuild
+++ b/dev-python/numpy/numpy-1.10.4-r1.ebuild
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Id$

-EAPI=5
+EAPI=6

 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 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"
@@ -21,25 +22,25 @@ 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="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 ~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.11.1-no-hardcode-blas.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() {
@@ -61,7 +62,7 @@ pc_libdir() {

 pc_libs() {
 	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\)\([ ]\|$\)//g' \
+		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|,$||'
 }
@@ -70,14 +71,14 @@ 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}
-			blas_libs = $(pc_libs cblas blas)
+			blas_libs = $(pc_libs cblas blas),m
 			[lapack]
 			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
+			lapack_libs = $(pc_libs lapack),m
 		EOF
 	else
 		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
@@ -112,8 +113,21 @@ python_prepare_all() {
 		-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
-	epatch_user
 }

 python_compile() {
@@ -123,9 +137,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)
@@ -137,7 +152,7 @@ python_install() {
 }

 python_install_all() {
-	DOCS+=( COMPATIBILITY DEV_README.txt THANKS.txt )
+	DOCS+=( THANKS.txt )

 	if use doc; then
 		HTML_DOCS=( "${WORKDIR}"/html/. )