From e082e4a71adc96c0a55a790aebebf24c84e00e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 6 Jun 2022 05:51:34 +0000 Subject: [PATCH] CI and docs: Remove Fedora 34 conditionals and mentions Fedora 34 is end of life. Related: rhbz#2117571 --- README.md | 2 +- tests/fake-requirements.spec | 4 ++-- tests/python-userpath.spec | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9f0cf04..ce32b7b 100644 --- a/README.md +++ b/README.md @@ -377,7 +377,7 @@ If multiple wheels were built from different directories, the value will differ depending on the current directory. -### Older pip with out-of-tree-build (Fedora 34, 35, and EL 9) +### Older pip with out-of-tree-build (Fedora 35 and EL 9) The value will expand to something like: diff --git a/tests/fake-requirements.spec b/tests/fake-requirements.spec index 795c49b..8515a39 100644 --- a/tests/fake-requirements.spec +++ b/tests/fake-requirements.spec @@ -23,8 +23,8 @@ EOF %check pip show toml click -%if 0%{?fedora} > 34 || 0%{?rhel} > 9 -# On F34, python3-devel requires (python3-setuptools if rpm-build) +%if 0%{?fedora} || 0%{?rhel} > 9 +# On RHEL 9, python3-devel requires (python3-setuptools if rpm-build) pip show setuptools && exit 1 || true %endif pip show wheel && exit 1 || true diff --git a/tests/python-userpath.spec b/tests/python-userpath.spec index d8d0f84..5f937fd 100644 --- a/tests/python-userpath.spec +++ b/tests/python-userpath.spec @@ -27,9 +27,6 @@ Summary: %{summary} ... -%if 0%{?fedora} > 34 || 0%{?rhel} -# On Fedora 34, we don't have hatchling, so this entire spec file builds nothing - %prep %autosetup -p1 -n userpath-%{version} sed -Ei '/^(coverage)$/d' requirements-dev.txt @@ -55,5 +52,3 @@ sed -Ei '/^(coverage)$/d' requirements-dev.txt %files -n python3-userpath -f %{pyproject_files} %{_bindir}/userpath - -%endif