From 74a32c3ccafc7895a037d2b0cf73fc726286ec2e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 Apr 2024 12:30:38 +0100 Subject: gentoo auto-resync : 06:04:2024 - 12:30:38 --- dev-python/trio/Manifest | 5 +- dev-python/trio/files/trio-0.24.0-musl.patch | 66 ------------------------- dev-python/trio/trio-0.24.0.ebuild | 72 ---------------------------- dev-python/trio/trio-0.25.0.ebuild | 2 +- 4 files changed, 2 insertions(+), 143 deletions(-) delete mode 100644 dev-python/trio/files/trio-0.24.0-musl.patch delete mode 100644 dev-python/trio/trio-0.24.0.ebuild (limited to 'dev-python/trio') diff --git a/dev-python/trio/Manifest b/dev-python/trio/Manifest index f43223cd88e5..c592f6d77d11 100644 --- a/dev-python/trio/Manifest +++ b/dev-python/trio/Manifest @@ -1,6 +1,3 @@ -AUX trio-0.24.0-musl.patch 2793 BLAKE2B 2e15fa8703361e0bc55f1fa067e2f35e24a778f6e34ae0cc2c08a05c15bd385f70a5e5d485a5252caf5cdbae37223fd48bea035debb6140eda945257d6565278 SHA512 1cd8133ba0d7c80e7277c445f39329139abe8740905e43c531fd86b1a100d1e75bdf038c8f2189e3a310ed8692e826ab5745133ea70b638bc6ddc4f659b0a71c -DIST trio-0.24.0.gh.tar.gz 592652 BLAKE2B c102c6b6e25b497a5823b58b926f43d06905a8aaa41434d9503c127cb1b26a3c58594edc90e48e9acea6e6ffbc36a2d02a9f1805b14ba65a77ffedcbb8cf48f8 SHA512 3f52e770a19c45b5227ffd34e7ae4664ee739dbae81c09e1e4bf2bd3eddb414ff9ab32dd2b18d59e420a18660a2f7db7ad2cda9f725729dda7e99f7a89b66bbc DIST trio-0.25.0.gh.tar.gz 599079 BLAKE2B d0615111fba3981c89d72a6eff93e9f500854e94f7227f3f235d4effa4ab53b9a280278b62db90c4a9612028edc5c9892b56464c9ee5b7e3c8120086dfc64e56 SHA512 0690193c501e054b5c2d96ea208d6a49b9ac860dd63a58c4b5cec5b5f6f197fc5eae0e2fae99ef498d5d1513b189a75504905bd5cc6dc34ae791e3451655933a -EBUILD trio-0.24.0.ebuild 1835 BLAKE2B 47252081fe8446c918645f740ce8df83beb9368d1ffd43b124130ea8e4c68e5309c41c3062a5118c3129b10f43f9e99fc3c3d4b26cb71532b991163dfec58eba SHA512 d6a3f9c691f7d5df4fad53ed451a533b2fad670576e2f415ada22f716e29307e454ffc50aa8ea1fef47362c7196f6acdd9807c5cf9cb021194097c0f214aeb5d -EBUILD trio-0.25.0.ebuild 1749 BLAKE2B f7704d67a41e99ba0dfc8a088e0046d9f2bd6cc0a8de64d021e345002009779da17f1a78220b2f61c36161969736146d43edc0b6fe7a3888f55c904382920425 SHA512 65fb7a2f926638bd094239603f3ea724a80ca8528f9ff0ff812101f8d06beb802e19804c44d06d6eb3fc646708b39ad6e81fc108372f1e84f312e6e40b81d017 +EBUILD trio-0.25.0.ebuild 1742 BLAKE2B 4f821136c5e31f4793e12e9355888211c761e3c8e7cb271d07850e421a6231dfb29d32f15064e3c110c70ab05c1ad14f08538cb86604b1007ef9f74870f2ad3d SHA512 fe4807a9245936cdc8b40de43c0da48467310c9882b516768190ae9c395ae2e59eea27488d17e47c9ebc9ee3a8b64dcab8b2a466885c4fa5be22d049d767b458 MISC metadata.xml 2060 BLAKE2B bb6ddfddfb3c19038e5982227a8c5f9999b93868c343a9a5bf7af5963006b5b719ef960f65b91747dfddf19544134db9e1a2d65e94192c079c64c303cdc8997a SHA512 4b86e7cccddc200d5616550e309ad46587f900ed13c38196e874e5110974b856d65e18745b8b7b42858cb672940ba280b0c2ea54d33f9b5bf32a375fa1232088 diff --git a/dev-python/trio/files/trio-0.24.0-musl.patch b/dev-python/trio/files/trio-0.24.0-musl.patch deleted file mode 100644 index b5b692bf6e0c..000000000000 --- a/dev-python/trio/files/trio-0.24.0-musl.patch +++ /dev/null @@ -1,66 +0,0 @@ -From c8c19570aa9e46b67d44228241e7401af96cbccd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Mon, 29 Jan 2024 17:48:40 +0100 -Subject: [PATCH] Fix finding pthread_*name_np on vanilla musl libc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix the `pthread_getname_np` and `pthread_setname_np` search logic -to support vanilla versions of musl and CPython, e.g. as used on Gentoo -musl systems. On such systems, there is no "libpthread.so" (there is -only a static library) and the relevant functions are found -in "libc.so". Additionally, `ctypes.util.find_library("c")` does not -work because of an old unsolved bug in CPython (linked in the code). - -To resolve the problem, add a fallback to trying `libc.so` if no pthread -library can be found. This roughly covers three possibilities: - -- a "typical" system with `libpthread.so` will find that library - and use it - -- a musl system will fall back to `libc.so`, load that library and find - pthread functions there - -- any other system will try to load `libc.so`, and fail - -The code in `get_os_thread_name_func()` remains fully relaxed, allowing -either CDLL construction (i.e. finding the library) to fail, -or the library not to contain `pthread_setname_np`. - -The code in `test_threads.py` was made more relaxed — rather than -skipping if `libpthread.so` does not exist, it tries to load `libc.so` -as a fallback, and skips if that fails. - -Originally reported as https://bugs.gentoo.org/923257. ---- - newsfragments/2939.bugfix.rst | 1 + - src/trio/_core/_thread_cache.py | 9 +++++++-- - src/trio/_tests/test_threads.py | 12 ++++++++++-- - 3 files changed, 18 insertions(+), 4 deletions(-) - create mode 100644 newsfragments/2939.bugfix.rst - -diff --git a/src/trio/_tests/test_threads.py b/src/trio/_tests/test_threads.py -index aefb4ba27..326cffd6b 100644 ---- a/src/trio/_tests/test_threads.py -+++ b/src/trio/_tests/test_threads.py -@@ -237,9 +237,17 @@ def _get_thread_name(ident: int | None = None) -> str | None: - - libpthread_path = ctypes.util.find_library("pthread") - if not libpthread_path: -- print(f"no pthread on {sys.platform})") -+ # musl includes pthread functions directly in libc.so -+ # (but note that find_library("c") does not work on musl, -+ # see: https://github.com/python/cpython/issues/65821) -+ # so try that library instead -+ # if it doesn't exist, CDLL() will fail below -+ libpthread_path = "libc.so" -+ try: -+ libpthread = ctypes.CDLL(libpthread_path) -+ except Exception: -+ print(f"no pthread on {sys.platform}") - return None -- libpthread = ctypes.CDLL(libpthread_path) - - pthread_getname_np = getattr(libpthread, "pthread_getname_np", None) - diff --git a/dev-python/trio/trio-0.24.0.ebuild b/dev-python/trio/trio-0.24.0.ebuild deleted file mode 100644 index 731ec9713527..000000000000 --- a/dev-python/trio/trio-0.24.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..12} ) - -inherit distutils-r1 - -DESCRIPTION="Python library for async concurrency and I/O" -HOMEPAGE=" - https://github.com/python-trio/trio/ - https://pypi.org/project/trio/ -" -SRC_URI=" - https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="|| ( Apache-2.0 MIT )" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - >=dev-python/attrs-20.1.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/exceptiongroup[${PYTHON_USEDEP}] - ' 3.10) - dev-python/idna[${PYTHON_USEDEP}] - dev-python/outcome[${PYTHON_USEDEP}] - >=dev-python/sniffio-1.3.0[${PYTHON_USEDEP}] - dev-python/sortedcontainers[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - >=dev-python/astor-0.8.0[${PYTHON_USEDEP}] - >=dev-python/immutables-0.6[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/trustme[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest -# Bug https://bugs.gentoo.org/916756 -# distutils_enable_sphinx docs/source \ -# dev-python/immutables \ -# dev-python/sphinxcontrib-trio \ -# dev-python/sphinx-rtd-theme \ -# dev-python/towncrier - -PATCHES=( - # https://github.com/python-trio/trio/pull/2939 - "${FILESDIR}/${P}-musl.patch" -) - -python_test() { - local EPYTEST_DESELECT=( - # Times out on slower arches (ia64 in this case) - # https://github.com/python-trio/trio/issues/1753 - tests/test_unix_pipes.py::test_close_at_bad_time_for_send_all - # requires ruff - _tests/tools/test_gen_exports.py - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - rm -rf trio || die - epytest -p trio._tests.pytest_plugin \ - -m "not redistributors_should_skip" \ - --pyargs trio \ - --skip-optional-imports -} diff --git a/dev-python/trio/trio-0.25.0.ebuild b/dev-python/trio/trio-0.25.0.ebuild index 01f9924188d7..9a7f71be22f6 100644 --- a/dev-python/trio/trio-0.25.0.ebuild +++ b/dev-python/trio/trio-0.25.0.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="|| ( Apache-2.0 MIT )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" RDEPEND=" >=dev-python/attrs-23.2.0[${PYTHON_USEDEP}] -- cgit v1.2.3