PR#399: CI: Adjust a couple of specs to allow Python 3.11 builds on RHEL 9 - rpms/pyproject-rpm-macros

rpms / pyproject-rpm-macros

#399 CI: Adjust a couple of specs to allow Python 3.11 builds on RHEL 9

Merged a year ago by churchyard. Opened a year ago by churchyard.

rpms/ churchyard/pyproject-rpm-macros c9ci into rawhide

CI: Adjust a couple of specs to allow Python 3.11 builds on RHEL 9

Miro Hrončok • a year ago

4f16920

tests/python-isort.spec

file modified

+7 -4

		`@@ -9,7 +9,7 @@`
		`URL: https://github.com/timothycrosley/%{modname}`
		`Source0: %{url}/archive/%{version}-2/%{modname}-%{version}-2.tar.gz`
		`BuildArch: noarch`
		`- BuildRequires: python3-devel`
		`+ BuildRequires: python%{python3_pkgversion}-devel`
		`BuildRequires: pyproject-rpm-macros`

		`%description`
		`@@ -17,10 +17,13 @@`
		`Building this tests that executables are not listed when +auto is not used`
		`with %%pyproject_save_files.`

		`- %package -n python3-%{modname}`
		`+ This package also uses %%{python3_pkgversion} in name and has a very limited`
		`+ set of dependencies -- allows to set a different value for it in the CI.`
		`+`
		`+ %package -n python%{python3_pkgversion}-%{modname}`
		`Summary: %{summary}`

		`- %description -n python3-%{modname}`
		`+ %description -n python%{python3_pkgversion}-%{modname}`
		`%{summary}.`


		`@@ -50,7 +53,7 @@`
		`grep -F %{_bindir}/%{modname} %{pyproject_files} && exit 1 \|\| true`


		`- %files -n python3-%{modname} -f %{pyproject_files}`
		`+ %files -n python%{python3_pkgversion}-%{modname} -f %{pyproject_files}`
		`%doc README.rst *.md`
		`%license LICENSE`
		`%{_bindir}/%{modname}`

tests/python-mistune.spec

file modified

+7 -5

		`@@ -8,11 +8,11 @@`
		`Source0: %{url}/archive/v%{version}.tar.gz`

		`BuildRequires: gcc`
		`- BuildRequires: python3-devel`
		`+ BuildRequires: python%{python3_pkgversion}-devel`
		`BuildRequires: pyproject-rpm-macros`

		`# optional dependency, listed explicitly to have the extension module:`
		`- BuildRequires: python3-Cython`
		`+ BuildRequires: python%{python3_pkgversion}-Cython`

		`%description`
		`This package contains an extension module. Does not contain pyproject.toml.`
		`@@ -22,11 +22,13 @@`
		`- default build backend without pyproject.toml`
		`Check %%pyproject_check_import basic functionality.`

		`+ This package also uses %%{python3_pkgversion} in name and has a very limited`
		`+ set of dependencies -- allows to set a different value for it in the CI.`

		`- %package -n python3-mistune`
		`+ %package -n python%{python3_pkgversion}-mistune`
		`Summary: %summary`

		`- %description -n python3-mistune`
		`+ %description -n python%{python3_pkgversion}-mistune`
		`%{summary}`


		`@@ -57,6 +59,6 @@`
		`test -f %{buildroot}%{python3_sitearch}/mistune.cpython-*.so`


		`- %files -n python3-mistune -f %{pyproject_files}`
		`+ %files -n python%{python3_pkgversion}-mistune -f %{pyproject_files}`
		`%doc README.rst`
		`%license LICENSE`

churchyard commented a year ago

Related: rhbz#2208971

zuul commented a year ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/d4900914a1534a659b44273110d8b357

check-for-arches : SUCCESS in 5m 07s
rpm-scratch-build : SUCCESS in 15m 31s
rpm-linter : SUCCESS in 8m 36s (non-voting)
rpm-rpminspect : SUCCESS in 12m 01s (non-voting)
check-for-sti-tests : SUCCESS in 17s
check-for-fmf-tests : SUCCESS in 17s
rpm-install-test : SUCCESS in 1m 17s
rpm-sti-test : SUCCESS in 26m 23s
Skipped 5 jobs

gotmax23 commented a year ago

Related: rhbz#2208971

I'd prefer not to have this on the Fedora side.

churchyard commented a year ago

Related: rhbz#2208971

I'd prefer not to have this on the Fedora side.

Well, this commit is here only because of RHEL, so I considered it appropriate.

rebased onto e10e798fedad7791d3e3a9f3bab299aa19ed4048

a year ago

zuul commented a year ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/2a3dddf64c844728939d5a6ec287f099

check-for-arches : SUCCESS in 2m 55s
rpm-scratch-build : SUCCESS in 11m 11s
rpm-linter : SUCCESS in 6m 13s (non-voting)
rpm-rpminspect : SUCCESS in 8m 50s (non-voting)
check-for-sti-tests : SUCCESS in 19s
check-for-fmf-tests : SUCCESS in 19s
rpm-install-test : SUCCESS in 1m 21s
rpm-sti-test : SUCCESS in 24m 39s
Skipped 5 jobs

ksurma commented a year ago

It makes sense to me as the means sync from Fedora to CentOS Stream easier. This was not immediately clear when only looking at the changes, so I'm in favor of adding a short explanation in the commit message.
IMO, the linked bugzilla doesn't contain that much of a useful information and could be skipped. It's clear that the changes come from/for RHEL 9 from the commit itself. If you see a stronger case in linking it, I'm not opposed to.
The tests run the same as before, feel free to ship it.

churchyard commented a year ago

How does this sound for a commit message?

CI: Adjust a couple of specs to allow Python 3.11 builds on RHEL 9

This allows running CI tests as:

    ./mocktest.sh python-isort --define 'python3_pkgversion 3.11'

Which only makes sense in RHEL, and hence is not done here.

The purpose of this change in Fedora is to make the test spec files identical to c9s,
for easier future synchronization.

Related c9s commit:
<XXX insert link once the c9s MR is merged>