diff options
Diffstat (limited to 'dev-python/zeroconf')
| -rw-r--r-- | dev-python/zeroconf/Manifest | 11 | ||||
| -rw-r--r-- | dev-python/zeroconf/files/zeroconf-0.146.5-cython-3.1.patch | 41 | ||||
| -rw-r--r-- | dev-python/zeroconf/zeroconf-0.146.3.ebuild | 60 | ||||
| -rw-r--r-- | dev-python/zeroconf/zeroconf-0.146.5.ebuild (renamed from dev-python/zeroconf/zeroconf-0.146.1.ebuild) | 22 | ||||
| -rw-r--r-- | dev-python/zeroconf/zeroconf-0.147.0.ebuild (renamed from dev-python/zeroconf/zeroconf-0.146.2.ebuild) | 17 |
5 files changed, 79 insertions, 72 deletions
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest index 411107546e8b..ca029e6bede7 100644 --- a/dev-python/zeroconf/Manifest +++ b/dev-python/zeroconf/Manifest @@ -1,7 +1,6 @@ -DIST zeroconf-0.146.1.tar.gz 161874 BLAKE2B 042bc3747dac7a63e05b454a12b5884d293490909e662cf8c7ab7bf871bd4983bbf04cb2eb2ae6e075a82ab586f95ef13c201875d42250898f234f69a288b21e SHA512 a0834e37f07e465e2bf4b99ac7630f98b7c09d9608ecd86d3b8e2a3cd9c3978c400f342b97c7299f10fe07de669356c088f74e4bb26d9316c98219844dee6392 -DIST zeroconf-0.146.2.tar.gz 162157 BLAKE2B 8b35e4309759a4668db5014bf747c30d87a399467e28078501d72bbe34cd39d9a4a6045b80ea51810a4f702130200c5c7db114253ae5512db98a78d80e791c31 SHA512 eacc2b94a7a3b0eeeb941aeb0dbf1bd26c78464daadd6e2a5ad91b2b21e76041e85cffa27ff8e4ccf8c78a22771d53ecc412099699f4e643895be1a784a0540a -DIST zeroconf-0.146.3.tar.gz 162429 BLAKE2B d9e59bba6e34540fdcfde01b4486db6340646b92160fe7ec6abf097eb1224bf45e1f76119d3ae71d13821b6f67621aecb7af0709b787b49f5cff392fba130d2d SHA512 d9fa896069fe3ee9f56945533f55b89ea9770a03fd6241b06323c9cdebfd1f3c185285b5159581156e8a9554c3b3aa8d35f4c6cb9cafe0efd98751a38de691e8 -EBUILD zeroconf-0.146.1.ebuild 1521 BLAKE2B a183044d8ae0e65238d20692fb38be1389d0607917f529317263d183873932c063e9e46e72950101883389b38d383e8a2cbd96da9f0f41ac1bbc1a562943f670 SHA512 82c746bae63e3fa2dc3b5eba9587182e2942495bbfa9580959924d8267d81de4655fabd1693a28a8f416778f100f90432d67ac07dcd19d09f310732c815d3f8b -EBUILD zeroconf-0.146.2.ebuild 1524 BLAKE2B 11feb0eaec1c4f7e8cd91b1253585a4c741f5fc880618cde9fe8b28d7b292a797c884a8e38c93659c24fd2919ccf8f5640d8fda7306bb30c5b0cb3b92384af05 SHA512 9f90c7b05212c39af8300e680a26adfcff77d1f3b060ee9f60794f5f0a9bea5e56114f90f661c4416a078ab1acb145f57a2f5fd53ab168adfabc6ee625ba8b3b -EBUILD zeroconf-0.146.3.ebuild 1524 BLAKE2B 11feb0eaec1c4f7e8cd91b1253585a4c741f5fc880618cde9fe8b28d7b292a797c884a8e38c93659c24fd2919ccf8f5640d8fda7306bb30c5b0cb3b92384af05 SHA512 9f90c7b05212c39af8300e680a26adfcff77d1f3b060ee9f60794f5f0a9bea5e56114f90f661c4416a078ab1acb145f57a2f5fd53ab168adfabc6ee625ba8b3b +AUX zeroconf-0.146.5-cython-3.1.patch 1725 BLAKE2B cb2ad2a724cd1488ff4d67eed8d0e4f5d08a0526f5a86cb06ae9d41107525dff14853a5299acced4b64bed0aa28082893d39f787f85b5976228ed5d60e9afb57 SHA512 35a0d58c00fbdb1fd528dec438c8315d43f5695dbde509f66812bd79a4f3d678d48e051736c3fd71c138366714638b4953d088cf1efe5679706e3ea404fe8b39 +DIST zeroconf-0.146.5.tar.gz 163906 BLAKE2B f54940354c2262420e1f3ed5fd3148438d2c5e9fa0f35b851c0a653c46b43471c9aaad120489bc0304baae586b860e7c8a3b8ee06c56072ad5b1237dc2ba5202 SHA512 4e6d2ea48435c0889b610623dfd68793b3891797030f3919888cb1866938ae5157d4a837a6cb8cc808d4aca8298bb00ef92827f790f5d4489f59e1a05685ca27 +DIST zeroconf-0.147.0.tar.gz 163958 BLAKE2B a706012207fc7b1b2a74dddb29729de1180f6025dfd19c59d06494fe62a66127231c96b3df49d10d55fb8b3d09bec78959092bd1b6cd68a4d6ea5c553a98579d SHA512 930902ea04f030bb557b9c2788c7c369d6f65c92b214bb094955e66868187ce8c8341b5a67382df2ddc42b769701b553bdb3b89871557bc9f2cc681fbe1ccc07 +EBUILD zeroconf-0.146.5.ebuild 1804 BLAKE2B d5cc6228dc1cc1e552f072384da87df887837a524939f96800f14791b4b9d9ca54fbd955c494d923630b0a1ba7c184e5dc85ce425e699eb3ea0da8f41202fc19 SHA512 29e9d2e283ab2ba9eff134b0001e2968be6c9efd779f8c63fa4c28028ed834bde48bbb6423a6ab7faa29ce5d5ee1a35bba3e8783f08bf5d98f1d7632c7babed8 +EBUILD zeroconf-0.147.0.ebuild 1698 BLAKE2B 424028d89221799508e5fce03ec87394d914df3d3e2dbd36c341f6e3cbd00e2ef1d8f461cd9b3508be3990cb00cdb779534c575853a608c0f8e537194bc987ad SHA512 6d4930a7fd9955d68616db63c157fd97474e4cce4c95980a4e449eae5433dbcea4cb4982db77d80780ef450ebc3ad3da07bbd5a48786b12b91e9b5cf7c78cbe9 MISC metadata.xml 395 BLAKE2B e1ce7a8fbd6d50fd59fbce671a535a3af2fde79dcc98f146c4e361759e61ce6d7e4e241866262fcd78744c673212d1946830c3d7628956b498a98d0af36d4c3d SHA512 544cb62da7212926b63c4e19467fc3e3f7c8210320a8096dc913a846d392e9a09c2b9860312f88effc8ad7a54e0329149a68012b08c674663af5779957e037f9 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 new file mode 100644 index 000000000000..3e533ed28f6b --- /dev/null +++ b/dev-python/zeroconf/files/zeroconf-0.146.5-cython-3.1.patch @@ -0,0 +1,41 @@ +From c45c924a2de4d8c153800e9a31a28e4d569d8280 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +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.3.ebuild b/dev-python/zeroconf/zeroconf-0.146.3.ebuild deleted file mode 100644 index 8ab627f86158..000000000000 --- a/dev-python/zeroconf/zeroconf-0.146.3.ebuild +++ /dev/null @@ -1,60 +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_{10..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" - -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=" - >=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 - -export REQUIRE_CYTHON=1 - -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 -} diff --git a/dev-python/zeroconf/zeroconf-0.146.1.ebuild b/dev-python/zeroconf/zeroconf-0.146.5.ebuild index 2099afab9ef4..a861efca3742 100644 --- a/dev-python/zeroconf/zeroconf-0.146.1.ebuild +++ b/dev-python/zeroconf/zeroconf-0.146.5.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit distutils-r1 pypi @@ -18,6 +18,7 @@ HOMEPAGE=" 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}] @@ -25,7 +26,9 @@ RDEPEND=" # the build system uses custom build script that uses distutils to build # C extensions, sigh BDEPEND=" - >=dev-python/cython-3.0.8[${PYTHON_USEDEP}] + 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}] @@ -34,7 +37,20 @@ BDEPEND=" distutils_enable_tests pytest -export REQUIRE_CYTHON=1 +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 diff --git a/dev-python/zeroconf/zeroconf-0.146.2.ebuild b/dev-python/zeroconf/zeroconf-0.147.0.ebuild index 8ab627f86158..a2390e4a62e8 100644 --- a/dev-python/zeroconf/zeroconf-0.146.2.ebuild +++ b/dev-python/zeroconf/zeroconf-0.147.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit distutils-r1 pypi @@ -18,6 +18,7 @@ HOMEPAGE=" 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}] @@ -25,7 +26,9 @@ RDEPEND=" # the build system uses custom build script that uses distutils to build # C extensions, sigh BDEPEND=" - >=dev-python/cython-3.0.8[${PYTHON_USEDEP}] + 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}] @@ -34,7 +37,15 @@ BDEPEND=" distutils_enable_tests pytest -export REQUIRE_CYTHON=1 +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 |