PR#138: Cleanup code path for Fedora < 32 - rpms/pyproject-rpm-macros

rpms / pyproject-rpm-macros

#138 Cleanup code path for Fedora < 32

Closed 3 years ago by churchyard. Opened 3 years ago by salimma.

rpms/ salimma/pyproject-rpm-macros epel8-candidate into master

Cleanup code path for Fedora < 32 (EOL)

Michel Alexandre Salim • 3 years ago

04480f3

pyproject-rpm-macros.spec

file modified

+4 -6

		`@@ -6,7 +6,7 @@`

		`# Keep the version at zero and increment only release`
		`Version: 0`
		`- Release: 32%{?dist}`
		`+ Release: 33%{?dist}`

		`# Macro files`
		`Source001: macros.pyproject`
		`@@ -39,11 +39,6 @@`
		`BuildRequires: python3dist(pytest)`
		`BuildRequires: python3dist(pyyaml)`
		`BuildRequires: python3dist(packaging)`
		`- %if 0%{fedora} < 32`
		`- # The %%if should not be needed, it works around:`
		`- # https://github.com/rpm-software-management/mock/issues/336`
		`- BuildRequires: (python3dist(importlib-metadata) if python3 < 3.8)`
		`- %endif`
		`BuildRequires: python3dist(pip)`
		`BuildRequires: python3dist(setuptools)`
		`BuildRequires: python3dist(toml)`
		`@@ -97,6 +92,9 @@`
		`%license LICENSE`

		`%changelog`
		`+ * Thu Dec 3 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 0-33`
		`+ - Cleanup code path for Fedora < 32 (EOL)`
		`+`
		`* Tue Nov 03 2020 Miro Hrončok <mhroncok@redhat.com> - 0-32`
		`- Allow multiple -e in %%pyproject_buildrequires`
		`- Fixes: rhbz#1886509`

salimma commented 3 years ago

Signed-off-by: Michel Alexandre Salim salimma@fedoraproject.org

zuul commented 3 years ago

Build failed.

rpm-scratch-build : SUCCESS in 4m 17s
rpm-linter : SUCCESS in 2m 47s
rpm-rpminspect : SUCCESS in 5m 37s (non-voting)
check-for-tests : SUCCESS in 11s
rpm-install-test : SKIPPED
rpm-test : FAILURE in 25m 45s

churchyard commented 3 years ago

So, no Fedora has Python 3.7 any more, so I assume we can get rid fo this code entirely instead. If we need to support EPEL, we talk about EPEL 9 anyway.

This code is not working without %generate_buildrequires.

Edited 3 years ago by churchyard

salimma commented 3 years ago

Yeah, I only noticed that belatedly. I'll clean up the code.

rebased onto 04480f3

3 years ago

salimma commented 3 years ago

Updated

churchyard commented 3 years ago

Thanks. This is also in https://src.fedoraproject.org/rpms/pyproject-rpm-macros/blob/master/f/macros.pyproject#_90

zuul commented 3 years ago

Build failed.