[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy-python2/files/, dev-python/numpy-python2/, profiles/

2021-01-30 Thread Michał Górny
commit: 44b83e623bb10696ec30b395774dd327e5e87925
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan 30 23:19:52 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan 30 23:19:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b83e62

dev-python/numpy-python2: Remove last-rited pkg

Closes: https://bugs.gentoo.org/735358
Signed-off-by: Michał Górny  gentoo.org>

 dev-python/numpy-python2/Manifest  |   4 -
 .../files/numpy-1.15.4-no-hardcode-blas.patch  |  76 --
 ...-1.16.5-setup.py-install-skip-build-fails.patch |  23 ---
 dev-python/numpy-python2/metadata.xml  |  12 --
 .../numpy-python2/numpy-python2-1.16.6.ebuild  | 157 -
 profiles/package.mask  |   7 -
 6 files changed, 279 deletions(-)

diff --git a/dev-python/numpy-python2/Manifest 
b/dev-python/numpy-python2/Manifest
deleted file mode 100644
index f76bbff74c9..000
--- a/dev-python/numpy-python2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST numpy-1.16.6.zip 5143340 BLAKE2B 
2c31473551aaf00e7d3175ce37463ce0f14ff3e77bdeb71c9f85ede634880e014d4a941b1f1c1bb107f1b01217d6a68cc71d188b7ae3edf833a6fd6a9a746acb
 SHA512 
c219841cc804c194a38b8e046b83265b8b7a35be8f33d68561ef17b085465dd11bd1e84fe1baea809af0efb09a9b13283f13728d125fcdd2221c30ec23fd0a50
-DIST numpy-html-1.16.6.zip 12190671 BLAKE2B 
c24586a40bb05fdb2f2f092778e01f7c60b17d2c695d0fb8577e988778ad80b711edf7e067a20c699946344a50febc152ab586f4653b80bcbeb489650dafbd1b
 SHA512 
ad25e7b91b992af78a6748f12d6fcbe153d96cb8667d5dc4a6b6b2a6105e24a11c32cbf63dd3314ed4aa9b65a55ec5b3a51cd7763af5dfdd133510ddd6e4ed16
-DIST numpy-ref-1.16.6.pdf 5183393 BLAKE2B 
e92a8a7a32ab45d2fdfd6760e62d8d9b5b3f89e202a29e18ef1b6ce49ec56bbfea0e48e0c47b4c35cad02783fa1db33726a0f4fed4a50b0d8ed84babced8b79e
 SHA512 
66dbb684f4140874d19826b479c781e16e7992a7cec46137f785f9a8fa071911966fbb3932cbcdcd040bbb5fbefac8c96d511ef623a57fc268aac9331aae8d22
-DIST numpy-user-1.16.6.pdf 621980 BLAKE2B 
ec735ff7057935d3a7f33f291792b74618f5dc10ee091c434f49c77e58f683821af9cce46286564ac9b8cb0111498f9d1b657d0c343e0a4313c3f895982dca8b
 SHA512 
ff03719c91707a39b4bc388558838f72d4412f34dd0b07f2a0b2cf8fedac6811e8789985013cf1f23c7a650f115655f71e9cadc51ef4e7ae6e49d7552752409a

diff --git a/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch 
b/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch
deleted file mode 100644
index 979b56bd6dc..000
--- a/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index 65d7de316..a85640d30 100644
 a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -364,29 +364,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
--  'openblas_clapack': openblas_clapack_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
--  'accelerate': accelerate_info,  # use blas_opt instead
--  'x11': x11_info,
-+cl = {'x11': x11_info,
-   'fft_opt': fft_opt_info,
-   'fftw': fftw_info,
-   'fftw2': fftw2_info,
-@@ -731,10 +709,7 @@ class system_info(object):
- 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 

[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy-python2/files/, dev-python/numpy-python2/

2020-04-16 Thread Mike Gilbert
commit: 81bcae35ca3f42bc92c1cbf977f5d08d4ea4409c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Apr 16 17:46:30 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Apr 16 17:46:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81bcae35

dev-python/numpy-python2: fix install with recent distutils-r1 change

Bug: https://bugs.gentoo.org/717706
Signed-off-by: Mike Gilbert  gentoo.org>

 ...-1.16.5-setup.py-install-skip-build-fails.patch | 23 ++
 .../numpy-python2/numpy-python2-1.16.5.ebuild  |  1 +
 2 files changed, 24 insertions(+)

diff --git 
a/dev-python/numpy-python2/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch
 
b/dev-python/numpy-python2/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch
new file mode 100644
index 000..aa141de27f4
--- /dev/null
+++ 
b/dev-python/numpy-python2/files/numpy-1.16.5-setup.py-install-skip-build-fails.patch
@@ -0,0 +1,23 @@
+From b8e741c66f71071c3406e592e1537570731bcb35 Mon Sep 17 00:00:00 2001
+From: mattip 
+Date: Sun, 26 May 2019 08:55:53 +0300
+Subject: [PATCH] BUG: setup.py install --skip-build fails
+
+---
+ numpy/distutils/command/install_clib.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/numpy/distutils/command/install_clib.py 
b/numpy/distutils/command/install_clib.py
+index 662aa00bda9..6a73f7e3308 100644
+--- a/numpy/distutils/command/install_clib.py
 b/numpy/distutils/command/install_clib.py
+@@ -19,6 +19,9 @@ def finalize_options(self):
+ 
+ def run (self):
+ build_clib_cmd = get_cmd("build_clib")
++if not build_clib_cmd.build_clib:
++# can happen if the user specified `--skip-build`
++build_clib_cmd.finalize_options()
+ build_dir = build_clib_cmd.build_clib
+ 
+ # We need the compiler to get the library name -> filename association

diff --git a/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild 
b/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild
index d98d8624653..b6c8b4fa6cf 100644
--- a/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild
+++ b/dev-python/numpy-python2/numpy-python2-1.16.5.ebuild
@@ -50,6 +50,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 PATCHES=(
"${FILESDIR}"/${MY_PN}-1.15.4-no-hardcode-blas.patch
+   "${FILESDIR}"/numpy-1.16.5-setup.py-install-skip-build-fails.patch
 )
 
 src_unpack() {



[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy-python2/files/, dev-python/numpy-python2/

2019-12-25 Thread Pacho Ramos
commit: 00d6926266e8a86f6d7f49f1e78a3a674d449a7c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Wed Dec 25 15:36:54 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Wed Dec 25 16:57:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00d69262

dev-python/numpy-python2: Package supporting py2 for smoother transition

As discussed in https://bugs.gentoo.org/703240 I will maintain a
numpy-python2 package to allow easier transition of reverse deps allowing to
still port them to python 3.8.

The idea of this package is to drop it as soon as possible, as a
consequence:
- python2-only packages depending on this should have a bug opened and
blocking bug #703754 to allow us to track upstream progress on python3
porting. As a consequence, if the package upstream is dead or not planning
to port to python3 ever, it should be treecleaned instead of adding a
dependency on this package.
- python3 packages also needing python2 support. During a transition period,
it's possible that we will need to temporally allow some packages (usually
libraries) to support python2 until other reverse deps of that libs are
handled. You should then open a bug report blocking bug #703756 to follow
the progress on porting them completely to python3. As a consequence, if
your package supports both, you must try to simply remove python2 support
over depending on this package, while only adding a dep on numpy-python2 if
it is really hard to handle all reverse deps immediately. In that case, a
bug report need to be opened as explained.

Closes: https://bugs.gentoo.org/703240
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Pacho Ramos  gentoo.org>

 dev-python/numpy-python2/Manifest  |   4 +
 .../files/numpy-1.15.4-no-hardcode-blas.patch  |  76 +
 dev-python/numpy-python2/metadata.xml  |   7 +
 .../numpy-python2/numpy-python2-1.16.5.ebuild  | 169 +
 4 files changed, 256 insertions(+)

diff --git a/dev-python/numpy-python2/Manifest 
b/dev-python/numpy-python2/Manifest
new file mode 100644
index 000..5d698101579
--- /dev/null
+++ b/dev-python/numpy-python2/Manifest
@@ -0,0 +1,4 @@
+DIST numpy-1.16.5.zip 5138208 BLAKE2B 
f5511650e66939a6ce21cfad7874aecdeb6c07a70b32419a808956e42c7819d82bb364f1632da91b4d8a5237001c8ae3cbdcac10651fa0acca9558bdeafb5437
 SHA512 
6dd790ff57fdb7e7b0bddb47ea2b70b2667edefe632548ec68934e12a16af4a51bed9726e495c4993aad4c448dc4a204d0a087577d43dcfc9fa0164eb1d4b898
+DIST numpy-html-1.16.4.zip 12097069 BLAKE2B 
db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5
 SHA512 
c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
+DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 
9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564
 SHA512 
983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
+DIST numpy-user-1.16.4.pdf 596203 BLAKE2B 
da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9
 SHA512 
3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6

diff --git a/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch 
b/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch
new file mode 100644
index 000..979b56bd6dc
--- /dev/null
+++ b/dev-python/numpy-python2/files/numpy-1.15.4-no-hardcode-blas.patch
@@ -0,0 +1,76 @@
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
+index 65d7de316..a85640d30 100644
+--- a/numpy/distutils/system_info.py
 b/numpy/distutils/system_info.py
+@@ -364,29 +364,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