PR#350: [F37] Adjusts %pyproject_buildrequires tests for tox 4 - rpms/pyproject-rpm-macros

rpms / pyproject-rpm-macros

#350 [F37] Adjusts %pyproject_buildrequires tests for tox 4

Closed a year ago by churchyard. Opened a year ago by churchyard.

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

Adjusts %pyproject_buildrequires tests for tox 4

Miro Hrončok • a year ago

16af5a7

pyproject-rpm-macros.spec

file modified

+5 -1

		`@@ -10,7 +10,7 @@`
		`# 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.5.0`
		`+ Version: 1.5.1`
		`Release: 1%{?dist}`

		`# Macro files`
		`@@ -127,6 +127,10 @@`
		`%license LICENSE`

		`%changelog`
		`+ * Fri Jan 13 2023 Miro Hrončok <mhroncok@redhat.com> - 1.5.1-1`
		`+ - Adjusts %%pyproject_buildrequires tests for tox 4`
		`+ - Fixes: rhbz#2160687`
		`+`
		`* Mon Nov 28 2022 Miro Hrončok <mhroncok@redhat.com> - 1.5.0-1`
		`- Use %%py3_test_envvars in %%tox when available`

pyproject_buildrequires_testcases.yaml

file modified

+87 -40

		`@@ -413,14 +413,24 @@`
		`toxdep2`
		`commands =`
		`true`
		`- expected: \|`
		`- python3dist(setuptools) >= 40.8`
		`- python3dist(wheel)`
		`- python3dist(wheel)`
		`- python3dist(tox-current-env) >= 0.0.6`
		`- python3dist(toxdep1)`
		`- python3dist(toxdep2)`
		`- python3dist(inst)`
		`+ expected:`
		`+ - \| # tox 3`
		`+ python3dist(setuptools) >= 40.8`
		`+ python3dist(wheel)`
		`+ python3dist(wheel)`
		`+ python3dist(tox-current-env) >= 0.0.6`
		`+ python3dist(toxdep1)`
		`+ python3dist(toxdep2)`
		`+ python3dist(inst)`
		`+ - \| # tox 4`
		`+ python3dist(setuptools) >= 40.8`
		`+ python3dist(wheel)`
		`+ python3dist(wheel)`
		`+ python3dist(tox-current-env) >= 0.0.6`
		`+ python3dist(tox)`
		`+ python3dist(toxdep1)`
		`+ python3dist(toxdep2)`
		`+ python3dist(inst)`
		`result: 0`

		`Tox extras:`
		`@@ -455,20 +465,36 @@`
		`extra1`
		`commands =`
		`true`
		`- expected: \|`
		`- python3dist(setuptools) >= 40.8`
		`- python3dist(wheel)`
		`- python3dist(wheel)`
		`- python3dist(tox-current-env) >= 0.0.6`
		`- python3dist(toxdep)`
		`- python3dist(inst)`
		`- python3dist(dep11) > 11.0`
		`- python3dist(dep12)`
		`- python3dist(dep21)`
		`- python3dist(dep22)`
		`- python3dist(dep23)`
		`- python3dist(extra-dep)`
		`- python3dist(extra-dep[extra_dep])`
		`+ expected:`
		`+ - \| # tox 3`
		`+ python3dist(setuptools) >= 40.8`
		`+ python3dist(wheel)`
		`+ python3dist(wheel)`
		`+ python3dist(tox-current-env) >= 0.0.6`
		`+ python3dist(toxdep)`
		`+ python3dist(inst)`
		`+ python3dist(dep11) > 11.0`
		`+ python3dist(dep12)`
		`+ python3dist(dep21)`
		`+ python3dist(dep22)`
		`+ python3dist(dep23)`
		`+ python3dist(extra-dep)`
		`+ python3dist(extra-dep[extra_dep])`
		`+ - \| # tox 4`
		`+ python3dist(setuptools) >= 40.8`
		`+ python3dist(wheel)`
		`+ python3dist(wheel)`
		`+ python3dist(tox-current-env) >= 0.0.6`
		`+ python3dist(tox)`
		`+ python3dist(toxdep)`
		`+ python3dist(inst)`
		`+ python3dist(dep11) > 11.0`
		`+ python3dist(dep12)`
		`+ python3dist(dep21)`
		`+ python3dist(dep22)`
		`+ python3dist(dep23)`
		`+ python3dist(extra-dep)`
		`+ python3dist(extra-dep[extra_dep])`
		`result: 0`

		`Tox provision unsatisfied:`
		`@@ -496,14 +522,24 @@`
		`deps =`
		`toxdep1`
		`toxdep2`
		`- expected: \|`
		`- python3dist(setuptools) >= 40.8`
		`- python3dist(wheel)`
		`- python3dist(wheel)`
		`- python3dist(tox-current-env) >= 0.0.6`
		`- python3dist(tox) >= 3.999`
		`- python3dist(setuptools) > 40.0`
		`- python3dist(wheel) > 2.0`
		`+ expected:`
		`+ - \| # tox 3`
		`+ python3dist(setuptools) >= 40.8`
		`+ python3dist(wheel)`
		`+ python3dist(wheel)`
		`+ python3dist(tox-current-env) >= 0.0.6`
		`+ python3dist(tox) >= 3.999`
		`+ python3dist(setuptools) > 40.0`
		`+ python3dist(wheel) > 2.0`
		`+ - \| # tox 4`
		`+ python3dist(setuptools) >= 40.8`
		`+ python3dist(wheel)`
		`+ python3dist(wheel)`
		`+ python3dist(tox-current-env) >= 0.0.6`
		`+ python3dist(tox) >= 3.999`
		`+ python3dist(setuptools) > 40.0`
		`+ python3dist(wheel) > 2.0`
		`+ python3dist(tox) >= 3.999`
		`result: 0`

		`Tox provision satisfied:`
		`@@ -530,16 +566,27 @@`
		`deps =`
		`toxdep1`
		`toxdep2`
		`- expected: \|`
		`- python3dist(setuptools) >= 40.8`
		`- python3dist(wheel)`
		`- python3dist(wheel)`
		`- python3dist(tox-current-env) >= 0.0.6`
		`- python3dist(tox) >= 3.5`
		`- python3dist(setuptools) > 40.0`
		`- python3dist(toxdep1)`
		`- python3dist(toxdep2)`
		`- python3dist(inst)`
		`+ expected:`
		`+ - \| # tox 3`
		`+ python3dist(setuptools) >= 40.8`
		`+ python3dist(wheel)`
		`+ python3dist(wheel)`
		`+ python3dist(tox-current-env) >= 0.0.6`
		`+ python3dist(tox) >= 3.5`
		`+ python3dist(setuptools) > 40.0`
		`+ python3dist(toxdep1)`
		`+ python3dist(toxdep2)`
		`+ python3dist(inst)`
		`+ - \| # tox 4`
		`+ python3dist(setuptools) >= 40.8`
		`+ python3dist(wheel)`
		`+ python3dist(wheel)`
		`+ python3dist(tox-current-env) >= 0.0.6`
		`+ python3dist(setuptools) > 40.0`
		`+ python3dist(tox) >= 3.5`
		`+ python3dist(toxdep1)`
		`+ python3dist(toxdep2)`
		`+ python3dist(inst)`
		`result: 0`

		`Default build system, unmet deps in requirements file:`

test_pyproject_buildrequires.py

file modified

+6 -1

		`@@ -71,7 +71,12 @@`
		`out, err = capfd.readouterr()`

		`if 'expected' in case:`
		`- assert out == case['expected']`
		`+ expected = case['expected']`
		`+ if isinstance(expected, list):`
		`+ # at least one of them needs to match`
		`+ assert any(out == e for e in expected)`
		`+ else:`
		`+ assert out == expected`

		`# stderr_contains may be a string or list of strings`
		`stderr_contains = case.get('stderr_contains')`