commit: 480f4de74b647be094ab6a88f9eca78eae9e25a7 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Sep 11 16:42:53 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Sep 11 16:42:53 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=480f4de7
dev-python/pyzmq: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pyzmq/Manifest | 2 - .../pyzmq/files/pyzmq-25.1.0-build_ext.patch | 50 ------------ dev-python/pyzmq/pyzmq-25.0.2.ebuild | 91 ---------------------- dev-python/pyzmq/pyzmq-25.1.0.ebuild | 89 --------------------- 4 files changed, 232 deletions(-) diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest index 3d938ca11667..64ba51e9228b 100644 --- a/dev-python/pyzmq/Manifest +++ b/dev-python/pyzmq/Manifest @@ -1,3 +1 @@ -DIST pyzmq-25.0.2.gh.tar.gz 398050 BLAKE2B 501aea8b46ef5c06ca75489869047b2e6aefd06d121b540fdfc85c45ea2f9a40b58b84433555d8001fbfb1671ad6df1953c79567aabc8cffba26516a4a60626c SHA512 dcba8fb561d1be135ba03e28078ed68835dc20a52ef9c47be240bd1edd37eb92d4da184045e8eff666f3d84a376ae35ca08172fc207823b5255160e9e3b1ef01 -DIST pyzmq-25.1.0.gh.tar.gz 399044 BLAKE2B c5507819844f174fcc5245fd89e6bff231ddc99add2c431a77a73955ce5e874f7387727380dee6a0618842762ed19a867699efed69c7997d5d4bcca480e30c44 SHA512 5a2a80162da4d1eb34cc13bc831cf01b98a1cfb62dd0595b81e47e77d752ecd59110fd447e5a936f74239253073fc5ceb6451e924928cd2c472e2ac61d26a78c DIST pyzmq-25.1.1.gh.tar.gz 389825 BLAKE2B d8e231a0eeaa6a7ad372da912cb42e96e4d862e163859b97d1c369a7940e019c074fc717685f53da06de69cfee79430e343fcd1987d768f3cc99ec75cad0955b SHA512 4aa0d5d5c1036e6ac35898c48d9612f677ee6e9345fafd02091ba81a5081f1ac8bf552eb5c03636ad643cc87e17f037013ec981d9b852c0252d30de8ce046d5a diff --git a/dev-python/pyzmq/files/pyzmq-25.1.0-build_ext.patch b/dev-python/pyzmq/files/pyzmq-25.1.0-build_ext.patch deleted file mode 100644 index 491ae6b23ea4..000000000000 --- a/dev-python/pyzmq/files/pyzmq-25.1.0-build_ext.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 24d65e10bee5b68751dc36e2ee7e6d6ed35751e5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Sat, 27 May 2023 07:11:24 +0200 -Subject: [PATCH] =?UTF-8?q?Call=20distutils'=20finalize=5Foptions()=20earl?= - =?UTF-8?q?y=20to=20fix=20build=5Fext=20-j=E2=80=A6?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Call the `finalize_options()` method of overridden distutils commands -before running the `configure` command, in order to fix errors due -to unconfigured `--jobs` option. This can be reproduced by running: - - $ python setup.py build_ext -j12 - […] - error: '<' not supported between instances of 'str' and 'int' - - Fatal: Falling back on bundled libzmq, but config has explicitly prohibited building the libzmq extension. ---- - setup.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index c52723d1..a4f8b4e3 100755 ---- a/setup.py -+++ b/setup.py -@@ -1107,9 +1107,9 @@ class CheckingBuildExt(build_ext): - patch_lib_paths(ext_path, self.compiler.library_dirs) - - def finalize_options(self): -+ super().finalize_options() - # check version, to prevent confusing undefined constant errors - self.distribution.run_command("configure") -- return super().finalize_options() - - - class ConstantsCommand(Command): -@@ -1258,8 +1258,8 @@ else: - patch_lib_paths(ext_path, self.compiler.library_dirs) - - def finalize_options(self): -+ super().finalize_options() - self.distribution.run_command("configure") -- return super().finalize_options() - - cmdclass["cython"] = CythonCommand - cmdclass["build_ext"] = zbuild_ext --- -2.40.1 - diff --git a/dev-python/pyzmq/pyzmq-25.0.2.ebuild b/dev-python/pyzmq/pyzmq-25.0.2.ebuild deleted file mode 100644 index c43410d1bcd3..000000000000 --- a/dev-python/pyzmq/pyzmq-25.0.2.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -# TODO: Find out exactly where this error comes from -# error: '<' not supported between instances of 'str' and 'int' -#DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library" -HOMEPAGE=" - https://zeromq.org/languages/python/ - https://pypi.org/project/pyzmq/ - https://github.com/zeromq/pyzmq/"; -SRC_URI=" - https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="drafts" - -# There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled. -DEPEND=" - >=net-libs/zeromq-4.2.2-r2:=[drafts=] -" -# It uses cffi backend for pypy, cython backend for cpython -RDEPEND="${DEPEND} - $(python_gen_cond_dep ' - dev-python/py[${PYTHON_USEDEP}] - dev-python/cffi:=[${PYTHON_USEDEP}] - ' pypy3) -" -BDEPEND=" - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_USEDEP}] - ' 'python*') - test? ( - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] - >=dev-python/tornado-5.0.2[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-23.2.0-libdir.patch -) - -EPYTEST_DESELECT=( - # TODO - zmq/tests/test_constants.py::TestConstants::test_draft - zmq/tests/test_cython.py::test_cython - - # Hangs often - zmq/tests/test_log.py::TestPubLog::test_blank_root_topic -) - -EPYTEST_IGNORE=( - # Avoid dependency on mypy - zmq/tests/test_mypy.py - - # Broken upstream - zmq/tests/test_auth.py - - # pytest-asyncio incompatibility? - zmq/tests/test_zmqstream.py -) - -distutils_enable_tests pytest -# TODO: Package enum_tools -# distutils_enable_sphinx docs/source \ -# dev-python/numpydoc \ -# dev-python/sphinx-rtd-theme \ -# dev-python/myst-parser - -python_prepare_all() { - export ZMQ_DRAFT_API=$(usex drafts '1' '0') - export ZMQ_PREFIX="${EPREFIX}/usr" - distutils-r1_python_prepare_all -} - -python_test() { - cd "${BUILD_DIR}/lib" || die - epytest -p no:flaky -} diff --git a/dev-python/pyzmq/pyzmq-25.1.0.ebuild b/dev-python/pyzmq/pyzmq-25.1.0.ebuild deleted file mode 100644 index beb30b72d634..000000000000 --- a/dev-python/pyzmq/pyzmq-25.1.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -# TODO: Find out exactly where this error comes from -# error: '<' not supported between instances of 'str' and 'int' -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library" -HOMEPAGE=" - https://zeromq.org/languages/python/ - https://pypi.org/project/pyzmq/ - https://github.com/zeromq/pyzmq/ -" -SRC_URI=" - https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="drafts" - -# There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled. -DEPEND=" - >=net-libs/zeromq-4.2.2-r2:=[drafts=] -" -# It uses cffi backend for pypy, cython backend for cpython -RDEPEND="${DEPEND} - $(python_gen_cond_dep ' - dev-python/py[${PYTHON_USEDEP}] - dev-python/cffi:=[${PYTHON_USEDEP}] - ' pypy3) -" -BDEPEND=" - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_USEDEP}] - ' 'python*') - test? ( - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] - >=dev-python/tornado-5.0.2[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-23.2.0-libdir.patch - # fix build_ext -j... invocation used by PEP517 build - # https://github.com/zeromq/pyzmq/pull/1872 - "${FILESDIR}"/${P}-build_ext.patch -) - -EPYTEST_DESELECT=( - # TODO - zmq/tests/test_auth.py - zmq/tests/test_cython.py - zmq/tests/test_zmqstream.py -) - -EPYTEST_IGNORE=( - # Avoid dependency on mypy - zmq/tests/test_mypy.py -) - -distutils_enable_tests pytest -# TODO: Package enum_tools -# distutils_enable_sphinx docs/source \ -# dev-python/numpydoc \ -# dev-python/sphinx-rtd-theme \ -# dev-python/myst-parser - -python_prepare_all() { - export ZMQ_DRAFT_API=$(usex drafts '1' '0') - export ZMQ_PREFIX="${EPREFIX}/usr" - distutils-r1_python_prepare_all -} - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - epytest -p asyncio -p rerunfailures -}
