From daf03eccbb87f79611d038bd6df6f7e95c31b225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 26 Jul 2024 16:59:24 +0200 Subject: [PATCH] Do not Recommend python2.7 on Fedora 41+ - https://fedoraproject.org/wiki/Changes/RetirePython2.7 Also, make the CI test ready for the retirement. --- python-tox.spec | 6 ++++-- tests/tests.yml | 6 ++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/python-tox.spec b/python-tox.spec index c5ab297..0a5aa9c 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -79,7 +79,6 @@ Summary: %{summary} # however it launches other Python versions as subprocesses. # It recommends all Python versions it supports. (This is an exception to # the rule that Fedora packages may not require the alternative interpreters.) -Recommends: python2.7 Recommends: python3.6 Recommends: python3.7 Recommends: python3.8 @@ -87,8 +86,11 @@ Recommends: python3.9 Recommends: python3.10 Recommends: pypy2-devel Recommends: pypy3-devel -Recommends: python2-devel Recommends: python3-devel +%if 0%{?fedora} && 0%{?fedora} < 41 +Recommends: python2.7 +Recommends: python2-devel +%endif # Instead of adding new Pythons here, add `Supplements: tox` to them, see: # https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/NVVUXSVSPFQOWIGBE2JNI67HEO7R63ZQ/ diff --git a/tests/tests.yml b/tests/tests.yml index ef3a95b..7addf64 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -30,9 +30,9 @@ - all_supplementing_pythons: dir: tests run: ./all_supplementing_pythons.py - - smoke27: + - smoke27_optional: dir: python/smoke - run: VERSION=2.7 METHOD=virtualenv ./venv.sh + run: VERSION=2.7 INSTALL_OR_SKIP=true METHOD=virtualenv ./venv.sh - smoke36: dir: python/smoke run: VERSION=3.6 ./venv.sh @@ -81,7 +81,6 @@ required_packages: - gcc - virtualenv - - python2.7 - python3.6 - python3.8 - python3.9 @@ -89,7 +88,6 @@ - python3.11-devel - python3.12-devel - python3.13-devel - - python2-devel - pypy3.9-devel - pypy3.10-devel - python3-tox