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

2022-05-16 Thread Michał Górny 
commit: 14f43f6b1faab8e495c88e0c3587bcbb58b175b1
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May 16 13:10:22 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May 16 13:10:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14f43f6b

dev-python/pyamg: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/pyamg/Manifest |  3 ---
 dev-python/pyamg/files/pyamg-4.0.0-test.patch | 14 --
 dev-python/pyamg/pyamg-4.1.0.ebuild   | 29 
 dev-python/pyamg/pyamg-4.2.1.ebuild   | 37 -
 dev-python/pyamg/pyamg-4.2.2.ebuild   | 39 ---
 5 files changed, 122 deletions(-)

diff --git a/dev-python/pyamg/Manifest b/dev-python/pyamg/Manifest
index 48e0aaa3ffbc..b2369788dc5a 100644
--- a/dev-python/pyamg/Manifest
+++ b/dev-python/pyamg/Manifest
@@ -1,4 +1 @@
-DIST pyamg-4.1.0.tar.gz 749906 BLAKE2B 
31c05d64317b32cbdbd616e982557f0a94bc17b2fce3d982fe93e629d56ad526516603032b3cba9785bf5ebed038481ae641f55a5a1ad621442dde08791981cb
 SHA512 
311642cbbe8dca621cb58bebb1bb05b7dc7b2364713886df96937ba56575137bcb4fb7006a232d2c14380cd41f4337f6f09a8a9794e279a155f27287497d2b08
-DIST pyamg-4.2.1.gh.tar.gz 3900395 BLAKE2B 
ad4427eb297f044b4782274ce55799bd9da4abec108267c4c0aaedab38e2fb4d89c4c365eca90e4045c411254640ead667fa0e511d9597ff00081c0ebacde9b2
 SHA512 
933f5f1da808cb02ff5fa91df54a48a971bb3b017582f5a829cf71c94f698469476b9f0306962140dc38f7265266c9b53f98dc7aaa99945b45bfa83003d26df9
-DIST pyamg-4.2.2.gh.tar.gz 3900331 BLAKE2B 
34858026eb9e1eff20101e3ef810e7f3fed40e5b363c3a0858189276259576b8abe4d2a46fc386a1d759eff724bb8b7814944d08fd555783cf33e908a05812f0
 SHA512 
f9f18df8b34f240be7e738f1e0f74f348d718f63bb7a32bf0c78158e2ace985d60fc182beee5a9e75248aad3fafe0525a6f41b3acc356c52ce15b52730cbd970
 DIST pyamg-4.2.3.gh.tar.gz 4101959 BLAKE2B 
190cce0bb06bbfc09e8c7a8d6d70498308e4d0e098c23a12d12ae8373b56ef183694430c1f85e287682f9733e3f85ff2bd94d8e10003f578af32f3c3f583a8f4
 SHA512 
ad11ed2870de41bb9596167a5a7fc3edd4c4bc898c2f5b5ffa3cfa862372d993fe1adfc5f3d199150ba69a4d2acbf75e5d99b3aa872273da0d05f1fd8d9f5c6d

diff --git a/dev-python/pyamg/files/pyamg-4.0.0-test.patch 
b/dev-python/pyamg/files/pyamg-4.0.0-test.patch
deleted file mode 100644
index 316d0a2baad4..
--- a/dev-python/pyamg/files/pyamg-4.0.0-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Backported from: 
https://github.com/pyamg/pyamg/commit/6f5e549e6105e18cfff9bf4b5f1834d081fa4510
-Author: Luke Olson
 a/pyamg/aggregation/tests/test_smooth.py
-+++ b/pyamg/aggregation/tests/test_smooth.py
-@@ -485,6 +485,9 @@ class TestEnergyMin(TestCase):
- Bc = ml.levels[1].B
- P = ml.levels[0].P.tocsr()
- 
-+T.eliminate_zeros()
-+P.eliminate_zeros()
-+
- # P should preserve B in its range, wherever P
- # has enough nonzeros
- mask = ((P.indptr[1:] - P.indptr[:-1]) >= B.shape[1])

diff --git a/dev-python/pyamg/pyamg-4.1.0.ebuild 
b/dev-python/pyamg/pyamg-4.1.0.ebuild
deleted file mode 100644
index 27080fa711fe..
--- a/dev-python/pyamg/pyamg-4.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Algebraic multigrid solvers in Python"
-HOMEPAGE="https://pyamg.org";
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/scipy[${PYTHON_USEDEP}]"
-# cannot be enabled by "distutils_enable_tests pytest"
-BDEPEND="
-   dev-python/pybind11[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-PATCHES=( "${FILESDIR}"/${PN}-4.0.0-test.patch )

diff --git a/dev-python/pyamg/pyamg-4.2.1.ebuild 
b/dev-python/pyamg/pyamg-4.2.1.ebuild
deleted file mode 100644
index 971ced744f5c..
--- a/dev-python/pyamg/pyamg-4.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Algebraic multigrid solvers in Python"
-HOMEPAGE="https://pyamg.org";
-SRC_URI="
-   https://github.com/pyamg/pyamg/archive/v${PV}.tar.gz
-   -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND="
-   dev-python/pybind11[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   test? (
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   )"
-
-distutils_enable_tests

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

2020-12-28 Thread David Seifert 
commit: 67871f63cf6eef11ea46f2bea168c6d4f08c1520
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Dec 28 15:49:53 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec 28 15:49:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67871f63

dev-python/pyamg: Bump to 4.0.0

Closes: https://bugs.gentoo.org/738128

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 dev-python/pyamg/Manifest |  1 +
 dev-python/pyamg/files/pyamg-4.0.0-test.patch | 14 ++
 dev-python/pyamg/pyamg-4.0.0.ebuild   | 25 +
 3 files changed, 40 insertions(+)

diff --git a/dev-python/pyamg/Manifest b/dev-python/pyamg/Manifest
index d3ed6ae9df1..27a0eed3b90 100644
--- a/dev-python/pyamg/Manifest
+++ b/dev-python/pyamg/Manifest
@@ -1 +1,2 @@
 DIST pyamg-3.2.1.tar.gz 765723 BLAKE2B 
72c59c0fe93363f73d8ba4c6297920dd1ca8406b048cf0357baec5f2390bdb524421a35ef65e790be45b543e9e162067ee8f8f09327b464a4bc5c9cec368b003
 SHA512 
6be0dd068417389934ce97813321367920abf6f9f5e94ce2df8bd796edc797cedd492c9153b62466f7d68055a05821447dcf21578ccdfe3294766a49a9ac220e
+DIST pyamg-4.0.0.tar.gz 717171 BLAKE2B 
16483d829e8a938359827ca8ebe3093c890685244125576e05220910b66e9aeec278472134d10c589e58dfbd363930cdd7ae13d16c9b9d54c1bd5250e66f4677
 SHA512 
cdd27834c12ef18f023e78b5b946c06bc2c35f73cf65fc4c76da2fab75f23466e6c1a4b3dccb8506be3ada7e0bafda38122d3d7315deebc7959d2e5300d9add1

diff --git a/dev-python/pyamg/files/pyamg-4.0.0-test.patch 
b/dev-python/pyamg/files/pyamg-4.0.0-test.patch
new file mode 100644
index 000..316d0a2baad
--- /dev/null
+++ b/dev-python/pyamg/files/pyamg-4.0.0-test.patch
@@ -0,0 +1,14 @@
+Backported from: 
https://github.com/pyamg/pyamg/commit/6f5e549e6105e18cfff9bf4b5f1834d081fa4510
+Author: Luke Olson
+--- a/pyamg/aggregation/tests/test_smooth.py
 b/pyamg/aggregation/tests/test_smooth.py
+@@ -485,6 +485,9 @@ class TestEnergyMin(TestCase):
+ Bc = ml.levels[1].B
+ P = ml.levels[0].P.tocsr()
+ 
++T.eliminate_zeros()
++P.eliminate_zeros()
++
+ # P should preserve B in its range, wherever P
+ # has enough nonzeros
+ mask = ((P.indptr[1:] - P.indptr[:-1]) >= B.shape[1])

diff --git a/dev-python/pyamg/pyamg-4.0.0.ebuild 
b/dev-python/pyamg/pyamg-4.0.0.ebuild
new file mode 100644
index 000..798cc36c9ec
--- /dev/null
+++ b/dev-python/pyamg/pyamg-4.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Algebraic multigrid solvers in Python"
+HOMEPAGE="https://pyamg.org";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/pybind11[${PYTHON_USEDEP}]
+   dev-python/scipy[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+PATCHES=( "${FILESDIR}"/${P}-test.patch )

[gentoo-commits] repo/gentoo:master commit in: dev-python/pyamg/files/

2016-09-13 Thread David Seifert 
commit: d21374997e4386a8d185c704304cfae0e95957be
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Mon Sep 12 18:10:03 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Sep 13 07:49:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2137499

dev-python/pyamg: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/2313

Signed-off-by: David Seifert  gentoo.org>

 dev-python/pyamg/files/2.0.0-stencil.patch   | 11 ---
 dev-python/pyamg/files/pyamg-2.0.4-gcc-4.7.patch | 16 
 2 files changed, 27 deletions(-)

diff --git a/dev-python/pyamg/files/2.0.0-stencil.patch 
b/dev-python/pyamg/files/2.0.0-stencil.patch
deleted file mode 100644
index f000b93..
--- a/dev-python/pyamg/files/2.0.0-stencil.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 pyamg/gallery/stencil.py.orig  2011-08-06 20:26:36.0 +0100
-+++ pyamg/gallery/stencil.py   2011-08-06 20:27:12.0 +0100
-@@ -85,7 +85,7 @@
- 
- # compute index offset of each dof within the stencil
- strides = numpy.cumprod( [1] + list(reversed(grid)) )[:-1]
--indices = S.nonzero()
-+indices = tuple(i.copy() for i in S.nonzero())
- for i,s in zip(indices,S.shape):
- i -= s // 2
- for stride,coords in zip(strides, reversed(indices)):

diff --git a/dev-python/pyamg/files/pyamg-2.0.4-gcc-4.7.patch 
b/dev-python/pyamg/files/pyamg-2.0.4-gcc-4.7.patch
deleted file mode 100644
index 0ed5402..
--- a/dev-python/pyamg/files/pyamg-2.0.4-gcc-4.7.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- pyamg/amg_core/ruge_stuben.h |2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/pyamg/amg_core/ruge_stuben.h b/pyamg/amg_core/ruge_stuben.h
-index 51cec80..d0ff9a9 100644
 a/pyamg/amg_core/ruge_stuben.h
-+++ b/pyamg/amg_core/ruge_stuben.h
-@@ -7,6 +7,8 @@
- #include 
- #include 
- #include 
-+#include "graph.h"
-+#include "linalg.h"
- 
- /*
-  *  Compute a strength of connection matrix using the classical strength