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

Fix reverted conditional in %pyproject_buildrequires -t/-e Fedora version comparison

Browse Source 
(cherry picked from Fedora commit c1326723a9)
This commit is contained in:
Miro Hrončok 2025-03-21 14:49:58 +01:00
parent f2e30c24db
commit ce96a462c7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pyproject-rpm-macros.spec
View File

@ -14,7 +14,7 @@ License: MIT
# Increment Y and reset Z when new macros or features are added
# Increment Z when this is a bugfix or a cosmetic change
# Dropping support for EOL Fedoras is *not* considered a breaking change
Version: 1.18.0
Version: 1.18.1
Release: 1%{?dist}
# Macro files
@ -191,6 +191,9 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856
%changelog
* Fri Mar 21 2025 Miro Hrončok <mhroncok@redhat.com> - 1.18.1-1
- Fix reverted conditional in %%pyproject_buildrequires -t/-e Fedora version comparison
* Tue Mar 11 2025 Miro Hrončok <mhroncok@redhat.com> - 1.18.0-1
- Make %%pyproject_buildrequires -t/-e and %%tox fail when no suitable tox configuration exists
- The %%pyproject_buildrequires -t/-e case is temporarily allowed on Fedora 40-42

2
pyproject_buildrequires.py
View File

@ -29,7 +29,7 @@ VERSION_RE = re.compile(r'[a-zA-Z0-9.-]+(\.\*)?')
# because %tox without config is dangerous (false sense of tests).
# Running %pyproject_buildrequires -t/-e without tox config is wrong, but not dangerous.
FEDORA = int(os.getenv('FEDORA') or 0)
TOX_ASSERT_CONFIG_OPTS = ('--assert-config',) if 40 <= FEDORA < 43 else ()
TOX_ASSERT_CONFIG_OPTS = () if 40 <= FEDORA < 43 else ('--assert-config',)
class EndPass(Exception):