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

Fix one remaining test for setuptools 70+

Browse Source 
This test was previously skipped because we didn't have new enough tox.
That's why it was never fixed for setuptools 70+.

This is a fixup for 20b7ac63f3

(cherry picked from commit 1532f1893f)
This commit is contained in:
Miro Hrončok 2024-11-13 13:59:59 +01:00
parent e8d079ef42
commit cc15860ccf
2 changed files with 20 additions and 9 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 Y and reset Z when new macros or features are added
# Increment Z when this is a bugfix or a cosmetic change # Increment Z when this is a bugfix or a cosmetic change
# Dropping support for EOL Fedoras is *not* considered a breaking change # Dropping support for EOL Fedoras is *not* considered a breaking change
Version: 1.16.1 Version: 1.16.2
Release: 1%{?dist} Release: 1%{?dist}
# Macro files # Macro files
@ -196,6 +196,9 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856
%changelog %changelog
* Wed Nov 13 2024 Miro Hrončok <mhroncok@redhat.com> - 1.16.2-1
- Fix one remaining test for setuptools 70+
* Thu Nov 07 2024 Miro Hrončok <miro@hroncok.cz> - 1.16.1-1 * Thu Nov 07 2024 Miro Hrončok <miro@hroncok.cz> - 1.16.1-1
- Support for setuptools 70+ - Support for setuptools 70+
- wheel is no longer generated as a dependency of the default build system - wheel is no longer generated as a dependency of the default build system

24
pyproject_buildrequires_testcases.yaml
View File

@ -1591,12 +1591,20 @@ tox with dependency_groups:
[tool.tox.env_run_base] [tool.tox.env_run_base]
dependency_groups = ["tests"] dependency_groups = ["tests"]
commands = [["pytest"]] commands = [["pytest"]]
expected: | expected:
python3dist(setuptools) - | # setuptools 70+
python3dist(wheel) python3dist(setuptools)
python3dist(tox-current-env) >= 0.0.6 python3dist(tox-current-env) >= 0.0.6
python3dist(tox) >= 4.22 python3dist(tox) >= 4.22
python3dist(tox) python3dist(tox)
python3dist(pytest) >= 5 python3dist(pytest) >= 5
python3dist(pytest-mock) python3dist(pytest-mock)
- | # setuptools < 70
python3dist(setuptools)
python3dist(wheel)
python3dist(tox-current-env) >= 0.0.6
python3dist(tox) >= 4.22
python3dist(tox)
python3dist(pytest) >= 5
python3dist(pytest-mock)
result: 0 result: 0