| Summary: | python-utils-r1: _python_impl_matches aborts too early when pattern contains 3.10 | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | Lucio Sauer <watermanpaint> |
| Component: | Eclasses | Assignee: | Python Gentoo Team <python> |
| Status: | RESOLVED FIXED | ||
| Severity: | critical | CC: | harrisl, juippis, mgorny, phantom4, watermanpaint |
| Priority: | Normal | Keywords: | PATCH |
| Version: | unspecified | ||
| Hardware: | All | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
| Attachments: | Skip pattern "3.10" to check others until we hopefully find a matching one | ||
|
Description
Lucio Sauer
2025-05-02 00:08:55 UTC
Created attachment 927291 [details, diff]
Skip pattern "3.10" to check others until we hopefully find a matching one
So far, I only looked at dependency calculations before/after applying the patch and at invocations of _python_impl_matches across ::gentoo, so this may need another pair of eyes on it :)
Any reason to not just fold it into the case below? I think the only reason it was separate before was for the benefit of pypy? In hindsight: commit 92cf8fae5081be46c320e45f52322849394b57f3 Author: Michał Górny <mgorny@gentoo.org> Date: Tue Apr 22 12:41:40 2025 +0200 python-utils-r1.eclass: Disable Python 3.10 / PyPy 3.10 targets Signed-off-by: Michał Górny <mgorny@gentoo.org> Part-of: https://github.com/gentoo/gentoo/pull/41697 Signed-off-by: Michał Górny <mgorny@gentoo.org> diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index 4969da1035661..c08c224cfdbd6 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -216,18 +203,12 @@ test_is "_python_impl_matches python3_6 python*" 0 test_is "_python_impl_matches python3_7 python*" 0 test_is "_python_impl_matches pypy3 python*" 1 set +f -test_is "_python_impl_matches python3_10 3.10" 0 -test_is "_python_impl_matches python3_10 3.11" 1 -test_is "_python_impl_matches python3_10 3.12" 1 should've given it away. We cleaned up such cases in the past but because we didn't have that cliff-edge in the pattern, it didn't cause a problem: commit cc939b81c322279e65f82c8c222dcb54015c65df Author: Michał Górny <mgorny@gentoo.org> Date: Mon May 1 13:55:22 2023 +0200 eclass/tests/python-utils-r1.sh: Stop testing python3_9 Signed-off-by: Michał Górny <mgorny@gentoo.org> Signed-off-by: Sam James <sam@gentoo.org> (Ignore last comment, I changed my mind on the last bit.) Thanks for the report, and sorry for my mistake. The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d133f3d0eb162f6d6e1385f9c96f9814315cd9c9 commit d133f3d0eb162f6d6e1385f9c96f9814315cd9c9 Author: Michał Górny <mgorny@gentoo.org> AuthorDate: 2025-05-02 04:10:01 +0000 Commit: Michał Górny <mgorny@gentoo.org> CommitDate: 2025-05-02 04:10:01 +0000 python-utils-r1.eclass: Fix matching pattern list starting with 3.10 Closes: https://bugs.gentoo.org/955213 Fixes: 92cf8fae5081 (Disable Python 3.10 / PyPy 3.10 targets) Signed-off-by: Michał Górny <mgorny@gentoo.org> eclass/python-utils-r1.eclass | 3 ++- eclass/tests/python-utils-r1.sh | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18accbc44e76533dfc42c1bd4666156972e53c50 commit 18accbc44e76533dfc42c1bd4666156972e53c50 Author: Petr Vaněk <arkamar@gentoo.org> AuthorDate: 2025-05-02 08:02:52 +0000 Commit: Petr Vaněk <arkamar@gentoo.org> CommitDate: 2025-05-02 08:02:52 +0000 eclass/tests: fix typo in bgo number The last digit was missing in bgo link. Fixes: d133f3d0eb16 ("python-utils-r1.eclass: Fix matching pattern list starting with 3.10") Bug: https://bugs.gentoo.org/955213 Signed-off-by: Petr Vaněk <arkamar@gentoo.org> eclass/tests/python-utils-r1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) I think we need to revbump previously affected packages to trigger a rebuild with correct dependencies. Apologies, this didn't cross my mind yesterday.
All affected packages according to `git grep -e "'.* 3.10[^)]" **/*.ebuild`:
dev-python/ipython-8.3{4,5,6}.0
dev-python/irc-20.5.0
dev-python/jaraco-context-6.0.1
dev-python/keyring-25.6.0
sci-libs/spglib-2.6.0
*** Bug 955221 has been marked as a duplicate of this bug. *** (In reply to Lucio Sauer from comment #8) > I think we need to revbump previously affected packages to trigger a rebuild > with correct dependencies. Apologies, this didn't cross my mind yesterday. > > All affected packages according to `git grep -e "'.* 3.10[^)]" **/*.ebuild`: > dev-python/ipython-8.3{4,5,6}.0 > dev-python/irc-20.5.0 > dev-python/jaraco-context-6.0.1 > dev-python/keyring-25.6.0 > sci-libs/spglib-2.6.0 Good idea, let me get to that right away. The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac305bad259c948981ad1fda273ec0da0a5a251d commit ac305bad259c948981ad1fda273ec0da0a5a251d Author: Michał Górny <mgorny@gentoo.org> AuthorDate: 2025-05-02 09:26:35 +0000 Commit: Michał Górny <mgorny@gentoo.org> CommitDate: 2025-05-02 09:29:34 +0000 dev-python/referencing: Revbump due to eclass 3.10 cond dep bug Bug: https://bugs.gentoo.org/955213 Signed-off-by: Michał Górny <mgorny@gentoo.org> .../{referencing-0.36.2.ebuild => referencing-0.36.2-r1.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed5040a3397aa70e5a0fa3f86599a1fd3d89ca70 commit ed5040a3397aa70e5a0fa3f86599a1fd3d89ca70 Author: Michał Górny <mgorny@gentoo.org> AuthorDate: 2025-05-02 09:26:23 +0000 Commit: Michał Górny <mgorny@gentoo.org> CommitDate: 2025-05-02 09:29:34 +0000 dev-python/pypiserver: Revbump due to eclass 3.10 cond dep bug Bug: https://bugs.gentoo.org/955213 Signed-off-by: Michał Górny <mgorny@gentoo.org> .../{pypiserver-2.3.2.ebuild => pypiserver-2.3.2-r1.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac9b2c547eaa3e03239c7c466ac0ad9d93fce80 commit 4ac9b2c547eaa3e03239c7c466ac0ad9d93fce80 Author: Michał Górny <mgorny@gentoo.org> AuthorDate: 2025-05-02 09:25:59 +0000 Commit: Michał Górny <mgorny@gentoo.org> CommitDate: 2025-05-02 09:29:33 +0000 dev-python/pyopenssl: Revbump due to eclass 3.10 cond dep bug Bug: https://bugs.gentoo.org/955213 Signed-off-by: Michał Górny <mgorny@gentoo.org> .../pyopenssl/{pyopenssl-25.0.0.ebuild => pyopenssl-25.0.0-r1.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6936003cf2ad2af6a55124c02711928452378c5 commit c6936003cf2ad2af6a55124c02711928452378c5 Author: Michał Górny <mgorny@gentoo.org> AuthorDate: 2025-05-02 09:24:57 +0000 Commit: Michał Górny <mgorny@gentoo.org> CommitDate: 2025-05-02 09:29:31 +0000 dev-python/ipykernel: Revbump due to eclass 3.10 cond dep bug Bug: https://bugs.gentoo.org/955213 Signed-off-by: Michał Górny <mgorny@gentoo.org> .../ipykernel/{ipykernel-6.29.5.ebuild => ipykernel-6.29.5-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10cc9bf4a24fb228dc14694bee75c79fab5b27b8 commit 10cc9bf4a24fb228dc14694bee75c79fab5b27b8 Author: Michał Górny <mgorny@gentoo.org> AuthorDate: 2025-05-02 09:24:22 +0000 Commit: Michał Górny <mgorny@gentoo.org> CommitDate: 2025-05-02 09:29:30 +0000 dev-python/httpx: Revbump due to eclass 3.10 cond dep bug Bug: https://bugs.gentoo.org/955213 Signed-off-by: Michał Górny <mgorny@gentoo.org> dev-python/httpx/{httpx-0.28.1.ebuild => httpx-0.28.1-r1.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=517c28eb6be2fc088ccb082c371a8e6336e86edb commit 517c28eb6be2fc088ccb082c371a8e6336e86edb Author: Michał Górny <mgorny@gentoo.org> AuthorDate: 2025-05-02 09:24:00 +0000 Commit: Michał Górny <mgorny@gentoo.org> CommitDate: 2025-05-02 09:29:29 +0000 dev-python/httpcore: Revbump due to eclass 3.10 cond dep bug Bug: https://bugs.gentoo.org/955213 Signed-off-by: Michał Górny <mgorny@gentoo.org> .../httpcore/{httpcore-1.0.8.ebuild => httpcore-1.0.8-r1.ebuild} | 2 +- .../httpcore/{httpcore-1.0.9.ebuild => httpcore-1.0.9-r1.ebuild} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3be0554d303c8d5de2fe4c572e117b66e740bee commit b3be0554d303c8d5de2fe4c572e117b66e740bee Author: Michał Górny <mgorny@gentoo.org> AuthorDate: 2025-05-02 09:23:11 +0000 Commit: Michał Górny <mgorny@gentoo.org> CommitDate: 2025-05-02 09:29:28 +0000 dev-python/anyio: Revbump due to eclass 3.10 cond dep bug Bug: https://bugs.gentoo.org/955213 Signed-off-by: Michał Górny <mgorny@gentoo.org> .../anyio/{anyio-4.8.0-r1.ebuild => anyio-4.8.0-r2.ebuild} | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5227397e001a61f08e9b7dd6872c49d0bf5b66ab commit 5227397e001a61f08e9b7dd6872c49d0bf5b66ab Author: Michał Górny <mgorny@gentoo.org> AuthorDate: 2025-05-02 09:21:47 +0000 Commit: Michał Górny <mgorny@gentoo.org> CommitDate: 2025-05-02 09:29:27 +0000 sci-libs/spglib: Revbump due to eclass 3.10 cond dep bug Bug: https://bugs.gentoo.org/955213 Signed-off-by: Michał Górny <mgorny@gentoo.org> sci-libs/spglib/{spglib-2.6.0.ebuild => spglib-2.6.0-r1.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfd0f375363e511f0f1d556395e58ed4b475aaf3 commit dfd0f375363e511f0f1d556395e58ed4b475aaf3 Author: Michał Górny <mgorny@gentoo.org> AuthorDate: 2025-05-02 09:20:27 +0000 Commit: Michał Górny <mgorny@gentoo.org> CommitDate: 2025-05-02 09:29:27 +0000 dev-python/keyring: Revbump due to eclass 3.10 cond dep bug Bug: https://bugs.gentoo.org/955213 Signed-off-by: Michał Górny <mgorny@gentoo.org> .../keyring/{keyring-25.6.0.ebuild => keyring-25.6.0-r1.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8095e194339fc7cac5df73e39be27f1710c50219 commit 8095e194339fc7cac5df73e39be27f1710c50219 Author: Michał Górny <mgorny@gentoo.org> AuthorDate: 2025-05-02 09:19:54 +0000 Commit: Michał Górny <mgorny@gentoo.org> CommitDate: 2025-05-02 09:29:26 +0000 dev-python/jaraco-context: Revbump due to eclass 3.10 cond dep bug Bug: https://bugs.gentoo.org/955213 Signed-off-by: Michał Górny <mgorny@gentoo.org> .../{jaraco-context-6.0.1.ebuild => jaraco-context-6.0.1-r1.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfe62862661b9ee2910a6f23d5640b85930d01f3 commit bfe62862661b9ee2910a6f23d5640b85930d01f3 Author: Michał Górny <mgorny@gentoo.org> AuthorDate: 2025-05-02 09:19:23 +0000 Commit: Michał Górny <mgorny@gentoo.org> CommitDate: 2025-05-02 09:29:25 +0000 dev-python/irc: Revbump due to eclass 3.10 cond dep bug Bug: https://bugs.gentoo.org/955213 Signed-off-by: Michał Górny <mgorny@gentoo.org> dev-python/irc/{irc-20.5.0.ebuild => irc-20.5.0-r1.ebuild} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2e44cd45370dd9d3c468ddadf12f20c054826b4 commit e2e44cd45370dd9d3c468ddadf12f20c054826b4 Author: Michał Górny <mgorny@gentoo.org> AuthorDate: 2025-05-02 09:18:46 +0000 Commit: Michał Górny <mgorny@gentoo.org> CommitDate: 2025-05-02 09:29:24 +0000 dev-python/ipython: Revbump due to 3.10 cond-dep eclass bug Bug: https://bugs.gentoo.org/955213 Signed-off-by: Michał Górny <mgorny@gentoo.org> .../ipython/{ipython-8.34.0.ebuild => ipython-8.34.0-r1.ebuild} | 2 +- .../ipython/{ipython-8.35.0.ebuild => ipython-8.35.0-r1.ebuild} | 2 +- .../ipython/{ipython-8.36.0.ebuild => ipython-8.36.0-r1.ebuild} | 9 +++------ .../ipython/{ipython-9.0.2.ebuild => ipython-9.0.2-r1.ebuild} | 0 .../ipython/{ipython-9.1.0.ebuild => ipython-9.1.0-r1.ebuild} | 0 .../ipython/{ipython-9.2.0.ebuild => ipython-9.2.0-r1.ebuild} | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) there are still issues with packages that don't yet support python3_13 and have
PYTHON_COMPAT=( python3_{11..12} )
These packages are showing nothing in the python_targets when they should be still showing python3_12. It is fine to flag these packages but it should not be necessary set python3_12 by hand.
That's unrelated to this. This bug is about specific gen_cond_dep arguments. |
