commit: ad7e221f179472d5ada264a2e253938e152ad400 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Nov 13 06:07:17 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Nov 13 06:55:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad7e221f
dev-python/pyzmq: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pyzmq/Manifest | 5 -- dev-python/pyzmq/files/pyzmq-23.2.0-libdir.patch | 11 --- dev-python/pyzmq/files/pyzmq-26.0.3-gcc14.patch | 53 -------------- dev-python/pyzmq/pyzmq-25.1.2.ebuild | 92 ------------------------ dev-python/pyzmq/pyzmq-26.0.2.ebuild | 87 ---------------------- dev-python/pyzmq/pyzmq-26.0.3.ebuild | 92 ------------------------ dev-python/pyzmq/pyzmq-26.1.0.ebuild | 80 --------------------- dev-python/pyzmq/pyzmq-26.1.1.ebuild | 80 --------------------- 8 files changed, 500 deletions(-) diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest index e13ae5564ea9..3baf46d72a72 100644 --- a/dev-python/pyzmq/Manifest +++ b/dev-python/pyzmq/Manifest @@ -1,6 +1 @@ -DIST pyzmq-25.1.2.gh.tar.gz 391272 BLAKE2B 80814704e7ea08d407859c1d71338f6ea283efcd1f3994155334aa5b60c4b6cd89167de8c78d19f8efdbeb5f4071f7b5954ea911eb6e7fbb48a0087b86579cab SHA512 b146a6dbce7cbbe2eb1da7ebd64e463067354f1566cdb4ff634b59bbb6d65e16263b6acb2d101a4ea53f870be5c753c9a12f9cc37bc5a81236681ea4fda6c56b -DIST pyzmq-26.0.2.gh.tar.gz 267895 BLAKE2B c71a0149cb6c596dfcbc760376aa14afa69bd927fcc739698f7d2ea44579dc8437ae605745b383a9b317ff66c092a4f963671e7933cf19f3f73acac16ac06daa SHA512 5772743e71810f9a0c332dcf16f04237eeb0a34ef2efdd22b63258ebe93e6b493a79845090e677a33582a9a80e7bee773160ec7ecfdaf240b655f3819e5b67a5 -DIST pyzmq-26.0.3.gh.tar.gz 268927 BLAKE2B 7504a45776e8c618833702563b50f672a3ecabb3353551ea61d2d2343dd9e955d1d2938046c2f90d115255482b9b6b2c0f1817b238e591b9319ac92a4341c04a SHA512 f4a32164daf9d9521be83008a94089406078779b9e0e56812a826df1fb295cc03781566825697313aa0c2b36b85b0bb760b8fb90959a856a0542b9072cde78c9 -DIST pyzmq-26.1.0.gh.tar.gz 272153 BLAKE2B d99bbdabfb93641361daadbe1ee8d4e5c578ef9faabf4c0457078082bb77d094040da43396e34d48cb2341491460ff39ebc8e5f3a19be2172e73df9fe6655e5c SHA512 288b6799cdc2b77f2972e928558ae74871054809075b534f33af876983da3b1cea35d6fd0fbfcb7caa8f3a458ae00da10935e31791c5c650c5589bfd5db577b0 -DIST pyzmq-26.1.1.gh.tar.gz 272236 BLAKE2B 49ec3c97b3d1b3e943522891ef067c6e4fdd1f5a2fd46f8c2927ba529f97ee8d177253f1a76fc1dd45813832827c8b35a1fc8fba42cf53eac37b59ec40a39251 SHA512 6e9ff9c021696935cb0513edc5eef8a130c56f3c95156a9805acfc174438fab5aaa356779308791b53dc01a166d41e094102ff445959515739102258c8d4e0de DIST pyzmq-26.2.0.gh.tar.gz 272883 BLAKE2B a43365afdc49ae845f1e6611bd463e90dbd133867d82c2bfdd3d9431238f68d80bb8073a4406110a91bf6f72cc6d66987a477673277c2b099d74c78f24b49d81 SHA512 ef069f5e71ad1cd39fdf4d5c2ede411752685af2d69ea8ad477c70e51ab011ece492ab25d06feefa7b7c7daefc5fc822d0f87199df2216865ece254c5724c423 diff --git a/dev-python/pyzmq/files/pyzmq-23.2.0-libdir.patch b/dev-python/pyzmq/files/pyzmq-23.2.0-libdir.patch deleted file mode 100644 index 66d16f24ad73..000000000000 --- a/dev-python/pyzmq/files/pyzmq-23.2.0-libdir.patch +++ /dev/null @@ -1,11 +0,0 @@ -https://bugs.gentoo.org/854627 ---- a/setup.py -+++ b/setup.py -@@ -275,7 +275,6 @@ def settings_from_prefix(prefix=None): - and platform.architecture()[0] == '64bit' - ): - settings['library_dirs'] += [pjoin(prefix, 'lib/amd64')] -- settings['library_dirs'] += [pjoin(prefix, 'lib')] - else: - # If prefix is not explicitly set, pull it from pkg-config by default. - # this is probably applicable across platforms, but i don't have diff --git a/dev-python/pyzmq/files/pyzmq-26.0.3-gcc14.patch b/dev-python/pyzmq/files/pyzmq-26.0.3-gcc14.patch deleted file mode 100644 index 8d87af8b7289..000000000000 --- a/dev-python/pyzmq/files/pyzmq-26.0.3-gcc14.patch +++ /dev/null @@ -1,53 +0,0 @@ -From bc5e214e957eb96c7e23b2c46a075e3850805ff1 Mon Sep 17 00:00:00 2001 -From: Min RK <[email protected]> -Date: Thu, 16 May 2024 08:34:51 +0200 -Subject: [PATCH 1/2] cffi: fix type of hint mutex pointer - ---- - zmq/backend/cffi/_cdefs.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/zmq/backend/cffi/_cdefs.h b/zmq/backend/cffi/_cdefs.h -index 6c9a06558..cf27f5b4e 100644 ---- a/zmq/backend/cffi/_cdefs.h -+++ b/zmq/backend/cffi/_cdefs.h -@@ -75,13 +75,14 @@ void * malloc(size_t sz); - void free(void *p); - int get_ipc_path_max_len(void); - -+typedef ... mutex_t; -+ - typedef struct _zhint { - void *sock; -- void *mutex; -+ mutex_t *mutex; - size_t id; - } zhint; - --typedef ... mutex_t; - mutex_t* mutex_allocate(); - - int zmq_wrap_msg_init_data(zmq_msg_t *msg, - -From b180ebc07fc04b0576fef50c3969fd48fa58694d Mon Sep 17 00:00:00 2001 -From: Min RK <[email protected]> -Date: Sun, 26 May 2024 00:29:06 +0200 -Subject: [PATCH 2/2] maybe it needs to specify struct - ---- - zmq/backend/cffi/_cdefs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/zmq/backend/cffi/_cdefs.h b/zmq/backend/cffi/_cdefs.h -index cf27f5b4e..7833b9b26 100644 ---- a/zmq/backend/cffi/_cdefs.h -+++ b/zmq/backend/cffi/_cdefs.h -@@ -75,7 +75,7 @@ void * malloc(size_t sz); - void free(void *p); - int get_ipc_path_max_len(void); - --typedef ... mutex_t; -+typedef struct { ...; } mutex_t; - - typedef struct _zhint { - void *sock; diff --git a/dev-python/pyzmq/pyzmq-25.1.2.ebuild b/dev-python/pyzmq/pyzmq-25.1.2.ebuild deleted file mode 100644 index f2cdc2acb62e..000000000000 --- a/dev-python/pyzmq/pyzmq-25.1.2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..12} ) -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="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" -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} -" -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 -) - -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 EPYTEST_DESELECT=( - # TODO - zmq/tests/test_auth.py - zmq/tests/test_cython.py - zmq/tests/test_zmqstream.py - - # swap thrashing on low-mem hosts, per Debian: - # https://salsa.debian.org/python-team/packages/pyzmq/-/blob/master/debian/patches/skip_large_send - zmq/tests/test_socket.py::TestSocket::test_large_send - ) - local EPYTEST_IGNORE=( - # Avoid dependency on mypy - zmq/tests/test_mypy.py - ) - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # not implemented in cffi variant? - zmq/tests/test_draft.py::TestDraftSockets - ) - esac - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - cd "${BUILD_DIR}/install$(python_get_sitedir)" || die - epytest -p asyncio -p rerunfailures -} diff --git a/dev-python/pyzmq/pyzmq-26.0.2.ebuild b/dev-python/pyzmq/pyzmq-26.0.2.ebuild deleted file mode 100644 index f57e936055b3..000000000000 --- a/dev-python/pyzmq/pyzmq-26.0.2.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=scikit-build-core -PYTHON_COMPAT=( pypy3 python3_{10..12} ) -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="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" -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} -" -BDEPEND=" - dev-python/packaging[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/cython-3.0.0[${PYTHON_USEDEP}] - ' 'python*') - test? ( - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] - >=dev-python/tornado-5.0.2[${PYTHON_USEDEP}] - ) -" - -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 - -src_configure() { - DISTUTILS_ARGS=( - -DZMQ_DRAFT_API="$(usex drafts)" - ) -} - -src_test() { - # need to move them around to make EPYTEST_IGNORE work cleanly - # with tests-in-package and extension modules - mv zmq/tests . || die - rm -r zmq || die - distutils-r1_src_test -} - -python_test() { - local EPYTEST_IGNORE=( - # Avoid dependency on mypy - tests/test_mypy.py - ) - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # not implemented in cffi variant? - tests/test_draft.py::TestDraftSockets - ) - esac - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - # avoid large to reduce memory consumption - epytest -p asyncio -p rerunfailures tests -m "not large" -} diff --git a/dev-python/pyzmq/pyzmq-26.0.3.ebuild b/dev-python/pyzmq/pyzmq-26.0.3.ebuild deleted file mode 100644 index d687f53070e1..000000000000 --- a/dev-python/pyzmq/pyzmq-26.0.3.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=scikit-build-core -PYTHON_COMPAT=( pypy3 python3_{10..13} ) -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="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" -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} -" -BDEPEND=" - dev-python/packaging[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/cython-3.0.0[${PYTHON_USEDEP}] - ' 'python*') - test? ( - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] - >=dev-python/tornado-5.0.2[${PYTHON_USEDEP}] - ) -" - -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 - -PATCHES=( - # https://github.com/zeromq/pyzmq/pull/1990 - "${FILESDIR}/${P}-gcc14.patch" -) - -src_configure() { - DISTUTILS_ARGS=( - -DZMQ_DRAFT_API="$(usex drafts)" - ) -} - -src_test() { - # need to move them around to make EPYTEST_IGNORE work cleanly - # with tests-in-package and extension modules - mv zmq/tests . || die - rm -r zmq || die - distutils-r1_src_test -} - -python_test() { - local EPYTEST_IGNORE=( - # Avoid dependency on mypy - tests/test_mypy.py - ) - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # not implemented in cffi variant? - tests/test_draft.py::TestDraftSockets - ) - esac - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - # avoid large to reduce memory consumption - epytest -p asyncio -p rerunfailures tests -m "not large" -} diff --git a/dev-python/pyzmq/pyzmq-26.1.0.ebuild b/dev-python/pyzmq/pyzmq-26.1.0.ebuild deleted file mode 100644 index 360f14ac69ec..000000000000 --- a/dev-python/pyzmq/pyzmq-26.1.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=scikit-build-core -PYTHON_COMPAT=( pypy3 python3_{10..13} ) -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="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" -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} -" -BDEPEND=" - dev-python/packaging[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/cython-3.0.0[${PYTHON_USEDEP}] - ' 'python*') - test? ( - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] - >=dev-python/tornado-5.0.2[${PYTHON_USEDEP}] - ) -" - -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 - -src_configure() { - DISTUTILS_ARGS=( - -DZMQ_DRAFT_API="$(usex drafts)" - ) -} - -python_test() { - local EPYTEST_IGNORE=( - # Avoid dependency on mypy - tests/test_mypy.py - ) - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # not implemented in cffi variant? - tests/test_draft.py::TestDraftSockets - ) - esac - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - rm -rf zmq || die - # avoid large to reduce memory consumption - epytest -p asyncio -p rerunfailures tests -m "not large" -} diff --git a/dev-python/pyzmq/pyzmq-26.1.1.ebuild b/dev-python/pyzmq/pyzmq-26.1.1.ebuild deleted file mode 100644 index 360f14ac69ec..000000000000 --- a/dev-python/pyzmq/pyzmq-26.1.1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=scikit-build-core -PYTHON_COMPAT=( pypy3 python3_{10..13} ) -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="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" -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} -" -BDEPEND=" - dev-python/packaging[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - >=dev-python/cython-3.0.0[${PYTHON_USEDEP}] - ' 'python*') - test? ( - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] - >=dev-python/tornado-5.0.2[${PYTHON_USEDEP}] - ) -" - -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 - -src_configure() { - DISTUTILS_ARGS=( - -DZMQ_DRAFT_API="$(usex drafts)" - ) -} - -python_test() { - local EPYTEST_IGNORE=( - # Avoid dependency on mypy - tests/test_mypy.py - ) - - case ${EPYTHON} in - pypy3) - EPYTEST_DESELECT+=( - # not implemented in cffi variant? - tests/test_draft.py::TestDraftSockets - ) - esac - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - rm -rf zmq || die - # avoid large to reduce memory consumption - epytest -p asyncio -p rerunfailures tests -m "not large" -}
