diff options
| author | Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> | 2021-01-17 23:35:33 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> | 2021-01-17 23:35:33 +0000 |
| commit | 8e8120eabdd28020aa69c7a60505cce2edd20adc (patch) | |
| tree | 061bf0acdc672720e0bc3a2d575f67d25aedb2d8 /dev-python/pyamg | |
| parent | c16790af2c9b4cbc38e565d4311252193ff85484 (diff) | |
| download | baldeagleos-repo-21.1.2.tar.gz baldeagleos-repo-21.1.2.tar.xz baldeagleos-repo-21.1.2.zip | |
Updating liguros repo21.1.2
Diffstat (limited to 'dev-python/pyamg')
| -rw-r--r-- | dev-python/pyamg/Manifest | 2 | ||||
| -rw-r--r-- | dev-python/pyamg/files/pyamg-4.0.0-test.patch | 14 | ||||
| -rw-r--r-- | dev-python/pyamg/pyamg-4.0.0.ebuild (renamed from dev-python/pyamg/pyamg-3.2.1-r1.ebuild) | 23 |
3 files changed, 24 insertions, 15 deletions
diff --git a/dev-python/pyamg/Manifest b/dev-python/pyamg/Manifest index d3ed6ae9df15..a1a195d67593 100644 --- a/dev-python/pyamg/Manifest +++ b/dev-python/pyamg/Manifest @@ -1 +1 @@ -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 000000000000..316d0a2baad4 --- /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-3.2.1-r1.ebuild b/dev-python/pyamg/pyamg-4.0.0.ebuild index 85993b45605c..27c1aecedaa5 100644 --- a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild +++ b/dev-python/pyamg/pyamg-4.0.0.ebuild @@ -3,8 +3,8 @@ EAPI=7 +DISTUTILS_USE_SETUPTOOLS=bdepend PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - inherit distutils-r1 DESCRIPTION="Algebraic multigrid solvers in Python" @@ -13,20 +13,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" +KEYWORDS="~amd64 ~x86" RDEPEND=" dev-python/numpy[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] ) -" + dev-python/pybind11[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}]" +# cannot be enabled by "distutils_enable_tests pytest" +BDEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )" + +distutils_enable_tests setup.py -python_test() { - distutils_install_for_testing - cd "${T}" || die # need to be away source directory - nosetests --verbose pyamg || die -} +PATCHES=( "${FILESDIR}"/${P}-test.patch ) |