rpms/pyproject-rpm-macros
7
0
Fork 0
Code Issues Pull Requests Releases Activity

CI and docs: Remove Fedora 34 conditionals and mentions

Browse Source 
Fedora 34 is end of life.
This commit is contained in:
Miro Hrončok 2022-05-27 20:59:12 +02:00 committed by churchyard
parent 07577de8ad
commit e31d5d5683
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -377,7 +377,7 @@ If multiple wheels were built from different directories,
the value will differ depending on the current directory. 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: The value will expand to something like:

4
tests/fake-requirements.spec
View File

@ -23,8 +23,8 @@ EOF
%check %check
pip show toml click pip show toml click
%if 0%{?fedora} > 34 || 0%{?rhel} > 9 %if 0%{?fedora} || 0%{?rhel} > 9
# On F34, python3-devel requires (python3-setuptools if rpm-build) # On RHEL 9, python3-devel requires (python3-setuptools if rpm-build)
pip show setuptools && exit 1 || true pip show setuptools && exit 1 || true
%endif %endif
pip show wheel && exit 1 || true pip show wheel && exit 1 || true

5
tests/python-userpath.spec
View File

@ -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 %prep
%autosetup -p1 -n userpath-%{version} %autosetup -p1 -n userpath-%{version}
sed -Ei '/^(coverage)$/d' requirements-dev.txt 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} %files -n python3-userpath -f %{pyproject_files}
%{_bindir}/userpath %{_bindir}/userpath
%endif