From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- dev-python/mpi4py/Manifest | 6 +- .../mpi4py/files/mpi4py-3.0.3-py38futures.patch | 131 --------------------- .../mpi4py/files/mpi4py-3.0.3-py38setup.patch | 25 ---- dev-python/mpi4py/mpi4py-3.0.3.ebuild | 70 ----------- dev-python/mpi4py/mpi4py-3.1.3.ebuild | 2 +- 5 files changed, 2 insertions(+), 232 deletions(-) delete mode 100644 dev-python/mpi4py/files/mpi4py-3.0.3-py38futures.patch delete mode 100644 dev-python/mpi4py/files/mpi4py-3.0.3-py38setup.patch delete mode 100644 dev-python/mpi4py/mpi4py-3.0.3.ebuild (limited to 'dev-python/mpi4py') diff --git a/dev-python/mpi4py/Manifest b/dev-python/mpi4py/Manifest index eacdfe41b652..427333f64e7b 100644 --- a/dev-python/mpi4py/Manifest +++ b/dev-python/mpi4py/Manifest @@ -1,7 +1,3 @@ -AUX mpi4py-3.0.3-py38futures.patch 4779 BLAKE2B 0e034da4e2237f15f1f6c559f520dc7ffad5ccb344b0b87f444461132919f26b42b861fd86ed4b785b2de176b726c6ac14d5f69aeb4cdac0b6e182cceacb265b SHA512 1193779d8fc0a26845d9435a55b6fea808785f6d2299c3b0fe6ba16c7c8b846d35041ebabe7f51f67aacbd3d1e4a1d334a36ac2b457941b2467cc0ca8a4b30f3 -AUX mpi4py-3.0.3-py38setup.patch 783 BLAKE2B f92a508e2f8c0749135b79c92656662729434b12c4b1d90587bafc02870c934d2aea135b963660835818c0596d0c0635e02af78e2a2b855259d96d252bf1b19d SHA512 0b35ff4d6ebdb7fe0bb117114d68f9823094429bfdab37d8c8ae404d1357bedbe0c75e46ac4ffbbfdc5197adb24f934ecedbce8eb2b00757c00421e1dad912d9 -DIST mpi4py-3.0.3.tar.gz 1429389 BLAKE2B 1e8c44b857b417237832682d0b3b5c90d1f1046fd8137d2a63972419ff8ec0e1fd2ebba521e2d2d6ba9f773b7c607370b55d8d75c9afeaca172ac06dd838943c SHA512 041768f753c8188b2560fe92711861780f0d77eda3281433520c98bb1e9b4da6a89c364f2d1c4623868ffbbcfde34ef556198b1bef6fc1c4a9c19cd5e71b546c DIST mpi4py-3.1.3.tar.gz 2461368 BLAKE2B 3ff7f6519a1ee96249567b1c65401fd1242c433bbb0a55c9d0a9b07f167ec44c71aefc24ac5fb354ceeb591dbfe97a4306f8455bb00559789367e91b78d80c16 SHA512 7a15224692016253120e8e88be1f7201e6f4548c1fb5ed15f04f416000b0d9e259dd8e80c0e237b1a960143e52b4a840d2a541359833387ac12868af1c059cea -EBUILD mpi4py-3.0.3.ebuild 1571 BLAKE2B 5e3e3424a50fc58c6891776ac221341ba22172a44e58a3e57c5a2ed0eb7eefbbc5c93984aa7a9521703dc5db55b74370cf43f9c4d50ca5246125a2ca9c62570a SHA512 1b4117487d63c2845b88ae301de9ae0ff2bbc5a9bbc7eb636216278cccb8040da13b8509f703d5cbe769c24b0cd720710538da79f29544f8f103fd81c9571e2e -EBUILD mpi4py-3.1.3.ebuild 1598 BLAKE2B 79d4f3ccff1fbc237b2e01395b1d4e63915917033d537c7a856538157fe4c05f1c718857df2ff39600e9e72de15dc5b8a6c3ef2fbbd2fceef8d8dec304b78125 SHA512 712a6b07d44aa59b15802492322bb34a9bdcfdeb124d935e0ce00e569589ce3fb30a6e196406805a635de8cb671df66cee8b73f62208bd82a03ded8ed3117d9c +EBUILD mpi4py-3.1.3.ebuild 1596 BLAKE2B 6b763755f484b58b6959482890ded6892000692924b4aece0f9b55ef5001aa72b18ef6e0dbcd04021bb552bafeccf4e2891bcb67e733a91a0b82860b4db2cf76 SHA512 6fcfd5682dc74e6bf65b9b3169618e1a4e252ec0254c495514bad1ff7fe07f5bd1faafdd2ce8cfc06d78d0daf26569e2bb568fc96de9fa27d38b09ab19fbdb5d MISC metadata.xml 1229 BLAKE2B 1634ae0e35f9b9362e9b4eaf21443a1fe6c7fc54ec6e4cc5914695533a3563586371cde7b48e34dfcdad6dc5a89f49bec705e434e68353e93e122c272fa163f3 SHA512 d0892adce1d1b5253185a9b539d2dca2a0d4cc96ce7e6e5cfb0507a90fdc88d92d7c74fc6fc93e951872bcfad73d4071b403b7e4269081c55b18789f09b35226 diff --git a/dev-python/mpi4py/files/mpi4py-3.0.3-py38futures.patch b/dev-python/mpi4py/files/mpi4py-3.0.3-py38futures.patch deleted file mode 100644 index 53b3aa36b2fb..000000000000 --- a/dev-python/mpi4py/files/mpi4py-3.0.3-py38futures.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 62a7b879051f2029fe46618f8bf9a019bdb96845 Mon Sep 17 00:00:00 2001 -From: Lisandro Dalcin -Date: Fri, 25 Oct 2019 12:22:41 +0300 -Subject: [PATCH] mpi4py.futures: Fixes to support Python 3.8 - ---- - demo/futures/test_futures.py | 7 +++++-- - src/mpi4py/futures/__init__.py | 10 ++++++++++ - src/mpi4py/futures/_base.py | 25 +++++++++++++++++++++++-- - 3 files changed, 38 insertions(+), 4 deletions(-) - -diff --git a/demo/futures/test_futures.py b/demo/futures/test_futures.py -index 925544d..7e03003 100644 ---- a/demo/futures/test_futures.py -+++ b/demo/futures/test_futures.py -@@ -1157,7 +1157,9 @@ class ThenTest(unittest.TestCase): - def transform(a): - try: - f = chain.pop(0) -- f.set_result(transform(a)) -+ r = transform(a) -+ f.__init__() -+ f.set_result(r) - return f - except IndexError: - return 42 -@@ -1176,7 +1178,8 @@ class ThenTest(unittest.TestCase): - self.assert_(new_f.exception()) - with self.assertRaises(RuntimeError) as catcher: - new_f.result() -- assert 'Circular future chain detected' in catcher.exception.args[0] -+ self.assert_('Circular future chain detected' -+ in catcher.exception.args[0]) - - - SKIP_POOL_TEST = False -diff --git a/src/mpi4py/futures/__init__.py b/src/mpi4py/futures/__init__.py -index d8c00bc..0518d7a 100644 ---- a/src/mpi4py/futures/__init__.py -+++ b/src/mpi4py/futures/__init__.py -@@ -15,6 +15,14 @@ try: - wait, - as_completed, - ) -+ try: # Python 3.7 -+ from concurrent.futures import BrokenExecutor -+ except ImportError: # pragma: no cover -+ BrokenExecutor = RuntimeError -+ try: # Python 3.8 -+ from concurrent.futures import InvalidStateError -+ except ImportError: # pragma: no cover -+ InvalidStateError = CancelledError.__base__ - except ImportError: # pragma: no cover - from ._base import ( - FIRST_COMPLETED, -@@ -22,6 +30,8 @@ except ImportError: # pragma: no cover - ALL_COMPLETED, - CancelledError, - TimeoutError, -+ InvalidStateError, -+ BrokenExecutor, - Future, - Executor, - wait, -diff --git a/src/mpi4py/futures/_base.py b/src/mpi4py/futures/_base.py -index cfbd2c0..3eaa512 100644 ---- a/src/mpi4py/futures/_base.py -+++ b/src/mpi4py/futures/_base.py -@@ -1,4 +1,4 @@ --# Backport of concurrent.futures._base from Python 3.7 -+# Backport of concurrent.futures._base from Python 3.8 - # pylint: skip-file - - # Copyright 2009 Brian Quinlan. All Rights Reserved. -@@ -61,6 +61,10 @@ class TimeoutError(Error): - """The operation exceeded the given deadline.""" - pass - -+class InvalidStateError(Error): -+ """The operation is not allowed in this state.""" -+ pass -+ - class _Waiter(object): - """Provides the event that wait() and as_completed() block on.""" - def __init__(self): -@@ -414,7 +418,14 @@ class Future(object): - if self._state not in [CANCELLED, CANCELLED_AND_NOTIFIED, FINISHED]: - self._done_callbacks.append(fn) - return -- fn(self) -+ try: -+ fn(self) -+ except Exception: -+ LOGGER.exception('exception calling callback for %r', self) -+ except BaseException: -+ raise -+ except: # old-style exception objects -+ LOGGER.exception('exception calling callback for %r', self) - - def result(self, timeout=None): - """Return the result of the call that the future represents. -@@ -527,6 +538,8 @@ class Future(object): - Should only be used by Executor implementations and unit tests. - """ - with self._condition: -+ if self._state in {CANCELLED, CANCELLED_AND_NOTIFIED, FINISHED}: -+ raise InvalidStateError('{}: {!r}'.format(self._state, self)) - self._result = result - self._state = FINISHED - for waiter in self._waiters: -@@ -540,6 +553,8 @@ class Future(object): - Should only be used by Executor implementations and unit tests. - """ - with self._condition: -+ if self._state in {CANCELLED, CANCELLED_AND_NOTIFIED, FINISHED}: -+ raise InvalidStateError('{}: {!r}'.format(self._state, self)) - self._exception = exception - self._state = FINISHED - for waiter in self._waiters: -@@ -625,3 +640,9 @@ class Executor(object): - def __exit__(self, exc_type, exc_val, exc_tb): - self.shutdown(wait=True) - return False -+ -+ -+class BrokenExecutor(RuntimeError): -+ """ -+ Raised when a executor has become non-functional after a severe failure. -+ """ --- -2.10.5 diff --git a/dev-python/mpi4py/files/mpi4py-3.0.3-py38setup.patch b/dev-python/mpi4py/files/mpi4py-3.0.3-py38setup.patch deleted file mode 100644 index 877486b40604..000000000000 --- a/dev-python/mpi4py/files/mpi4py-3.0.3-py38setup.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 36e77661b7a879f0ec1eb165c3b5cd0259eb8496 Mon Sep 17 00:00:00 2001 -From: Lisandro Dalcin -Date: Sat, 28 Sep 2019 18:10:52 +0300 -Subject: [PATCH] setup: Minor fix for Python 3.8 - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 235b115..9c03c49 100644 ---- a/setup.py -+++ b/setup.py -@@ -336,7 +336,7 @@ def configure_pyexe(exe, config_cmd): - libraries = [] - library_dirs = [] - link_args = [] -- if not sysconfig.get_config_var('Py_ENABLE_SHARED'): -+ if pyver >= (3, 8) or not cfg_vars.get('Py_ENABLE_SHARED'): - py_version = sysconfig.get_python_version() - py_abiflags = getattr(sys, 'abiflags', '') - libraries = ['python' + py_version + py_abiflags] --- -2.10.5 - diff --git a/dev-python/mpi4py/mpi4py-3.0.3.ebuild b/dev-python/mpi4py/mpi4py-3.0.3.ebuild deleted file mode 100644 index 2a020662ac41..000000000000 --- a/dev-python/mpi4py/mpi4py-3.0.3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -DESCRIPTION="Message Passing Interface for Python" -HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.org/project/mpi4py/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -IUSE="doc examples test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - virtual/mpi -" -DEPEND="${RDEPEND} - test? ( - dev-python/nose[${PYTHON_USEDEP}] - virtual/mpi[romio] - ) -" - -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}/${P}-py38setup.patch" - "${FILESDIR}/${P}-py38futures.patch" -) - -src_prepare() { - sed -e 's/++Py_REFCNT/Py_INCREF/' \ - -e 's/--Py_REFCNT/Py_DECREF/' \ - -i src/*.c || die - distutils-r1_src_prepare -} - -python_prepare_all() { - # not needed on install - rm -vr docs/source || die - rm test/test_pickle.py || die # disabled by Gentoo-bug #659348 - distutils-r1_python_prepare_all -} - -src_compile() { - export FAKEROOTKEY=1 - distutils-r1_src_compile -} - -python_test() { - echo "Beginning test phase" - pushd "${BUILD_DIR}"/../ &> /dev/null || die - mpiexec --use-hwthread-cpus --mca btl tcp,self -n 1 "${PYTHON}" -B ./test/runtests.py -v --exclude="test_msgspec" || - die "Testsuite failed under ${EPYTHON}" - popd &> /dev/null || die -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/. ) - use examples && local DOCS=( demo ) - distutils-r1_python_install_all -} diff --git a/dev-python/mpi4py/mpi4py-3.1.3.ebuild b/dev-python/mpi4py/mpi4py-3.1.3.ebuild index 82dad43fd50f..c1d94939330e 100644 --- a/dev-python/mpi4py/mpi4py-3.1.3.ebuild +++ b/dev-python/mpi4py/mpi4py-3.1.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~riscv x86 ~amd64-linux ~x86-linux" IUSE="doc examples test" RESTRICT="!test? ( test )" -- cgit v1.2.3