commit: eed91f09223a7ae661103b3b9481411f231e963e Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat May 24 10:49:40 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat May 24 10:49:40 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed91f09
dev-python/zeroconf: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/zeroconf/Manifest | 1 - .../files/zeroconf-0.146.5-cython-3.1.patch | 41 ------------ dev-python/zeroconf/zeroconf-0.146.5.ebuild | 76 ---------------------- 3 files changed, 118 deletions(-) diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest index da153d7e87d1..267ad3e5a996 100644 --- a/dev-python/zeroconf/Manifest +++ b/dev-python/zeroconf/Manifest @@ -1,2 +1 @@ -DIST zeroconf-0.146.5.tar.gz 163906 BLAKE2B f54940354c2262420e1f3ed5fd3148438d2c5e9fa0f35b851c0a653c46b43471c9aaad120489bc0304baae586b860e7c8a3b8ee06c56072ad5b1237dc2ba5202 SHA512 4e6d2ea48435c0889b610623dfd68793b3891797030f3919888cb1866938ae5157d4a837a6cb8cc808d4aca8298bb00ef92827f790f5d4489f59e1a05685ca27 DIST zeroconf-0.147.0.tar.gz 163958 BLAKE2B a706012207fc7b1b2a74dddb29729de1180f6025dfd19c59d06494fe62a66127231c96b3df49d10d55fb8b3d09bec78959092bd1b6cd68a4d6ea5c553a98579d SHA512 930902ea04f030bb557b9c2788c7c369d6f65c92b214bb094955e66868187ce8c8341b5a67382df2ddc42b769701b553bdb3b89871557bc9f2cc681fbe1ccc07 diff --git a/dev-python/zeroconf/files/zeroconf-0.146.5-cython-3.1.patch b/dev-python/zeroconf/files/zeroconf-0.146.5-cython-3.1.patch deleted file mode 100644 index 3e533ed28f6b..000000000000 --- a/dev-python/zeroconf/files/zeroconf-0.146.5-cython-3.1.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c45c924a2de4d8c153800e9a31a28e4d569d8280 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Sat, 3 May 2025 14:26:57 +0200 -Subject: [PATCH] Workaround Cython-3.1 problems - -Disable the use of type annotations since they are often incorrect -upstream, and workaround one other problem caused by wrong annotations. ---- - build_ext.py | 2 +- - src/zeroconf/_services/browser.py | 5 ++++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/build_ext.py b/build_ext.py -index ff088f8..7ebe344 100644 ---- a/build_ext.py -+++ b/build_ext.py -@@ -62,7 +62,7 @@ def build(setup_kwargs: Any) -> None: - { - "ext_modules": cythonize( - EXTENSIONS, -- compiler_directives={"language_level": "3"}, # Python 3 -+ compiler_directives={"language_level": "3", "annotation_typing": False}, # Python 3 - ), - "cmdclass": {"build_ext": BuildExt}, - } -diff --git a/src/zeroconf/_services/browser.py b/src/zeroconf/_services/browser.py -index ab8c050..6af2af8 100644 ---- a/src/zeroconf/_services/browser.py -+++ b/src/zeroconf/_services/browser.py -@@ -394,7 +394,10 @@ class QueryScheduler: - refresh_time_millis: float_, - ) -> None: - """Schedule a query for a pointer.""" -- ttl = int(pointer.ttl) if isinstance(pointer.ttl, float) else pointer.ttl -+ if isinstance(pointer.ttl, float): -+ ttl = int(pointer.ttl) -+ else: -+ ttl = pointer.ttl - scheduled_ptr_query = _ScheduledPTRQuery( - pointer.alias, pointer.name, ttl, expire_time_millis, refresh_time_millis - ) diff --git a/dev-python/zeroconf/zeroconf-0.146.5.ebuild b/dev-python/zeroconf/zeroconf-0.146.5.ebuild deleted file mode 100644 index a861efca3742..000000000000 --- a/dev-python/zeroconf/zeroconf-0.146.5.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{11..13} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)" -HOMEPAGE=" - https://github.com/python-zeroconf/python-zeroconf/ - https://pypi.org/project/zeroconf/ -" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux" -IUSE="+native-extensions" - -RDEPEND=" - >=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}] -" -# the build system uses custom build script that uses distutils to build -# C extensions, sigh -BDEPEND=" - native-extensions? ( - >=dev-python/cython-3.0.8[${PYTHON_USEDEP}] - ) - >=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}] - test? ( - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -PATCHES=( - # https://bugs.gentoo.org/954107 (workaround) - "${FILESDIR}/zeroconf-0.146.5-cython-3.1.patch" -) - -python_compile() { - if use native-extensions; then - local -x REQUIRE_CYTHON=1 - else - local -x SKIP_CYTHON=1 - fi - - distutils-r1_python_compile -} - -python_test() { - local -x SKIP_IPV6=1 - local EPYTEST_DESELECT=( - # network - tests/test_core.py::Framework::test_close_multiple_times - tests/test_core.py::Framework::test_launch_and_close - tests/test_core.py::Framework::test_launch_and_close_context_manager - - # fragile to timeouts (?) - tests/services/test_browser.py::test_service_browser_expire_callbacks - tests/utils/test_asyncio.py::test_run_coro_with_timeout - - # randomly broken by a leftover thread? - tests/test_circular_imports.py::test_circular_imports - ) - local EPYTEST_IGNORE=( - tests/benchmarks - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -o addopts= -p asyncio -}
