rpms/python-tox
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move test dependencies removal from fix-tests.patch to a sed

Browse source 
That way, the patch is easier applied for future rebases.

pyproject.toml after %prep is identical to what it was before this commit.

[skip changelog]
This commit is contained in:
Miro Hrončok 2025-11-10 11:19:50 +01:00
commit bfcb4db415
2 changed files with 6 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
fix-tests.patch
View file

@ -9,7 +9,7 @@ Content-Transfer-Encoding: 8bit
Co-Authored-By: Lumir Balhar <lbalhar@redhat.com> Co-Authored-By: Lumir Balhar <lbalhar@redhat.com>
Co-Authored-By: Miro Hrončok <miro@hroncok.cz> Co-Authored-By: Miro Hrončok <miro@hroncok.cz>
--- ---
pyproject.toml | 10 +--------- pyproject.toml | 4 +---
src/tox/pytest.py | 14 ++------------ src/tox/pytest.py | 14 ++------------
tests/test_provision.py | 11 ++++------- tests/test_provision.py | 11 ++++-------
.../package/test_python_package_util.py | 10 ++++++++-- .../package/test_python_package_util.py | 10 ++++++++--
@ -19,26 +19,6 @@ diff --git a/pyproject.toml b/pyproject.toml
index 6920d19..53326bc 100644 index 6920d19..53326bc 100644
--- a/pyproject.toml --- a/pyproject.toml
+++ b/pyproject.toml +++ b/pyproject.toml
@@ -76,11 +76,6 @@ dev = [
]
test = [
"build[virtualenv]>=1.3",
- "covdefaults>=2.3",
- "coverage>=7.10.7",
- "detect-test-pollution>=1.2",
- "devpi-process>=1.0.2",
- "diff-cover>=9.7.1",
"distlib>=0.4",
"flaky>=3.8.1",
"hatch-vcs>=0.5",
@@ -88,7 +83,6 @@ test = [
"pdm-backend>=2.4.5",
"psutil>=7.1",
"pytest>=8.4.2",
- "pytest-cov>=7",
"pytest-mock>=3.15.1",
"pytest-xdist>=3.8",
"re-assert>=1.1",
@@ -201,6 +195,7 @@ filterwarnings = [ @@ -201,6 +195,7 @@ filterwarnings = [
"error", "error",
"ignore:unclosed database in <sqlite3.Connection object at:ResourceWarning", "ignore:unclosed database in <sqlite3.Connection object at:ResourceWarning",

9
python-tox.spec
View file

@ -28,9 +28,8 @@ License: MIT
URL: https://tox.readthedocs.io/ URL: https://tox.readthedocs.io/
Source: %{pypi_source tox} Source: %{pypi_source tox}
# Remove dependency on devpi-process. # Remove usage of devpi-process.
# Remove dependency on detect-test-pollution. # Remove coverage options.
# Remove coverage-related dependencies.
# Adjust virtualenv environment variables to make it work with our patched virtualenv. # Adjust virtualenv environment variables to make it work with our patched virtualenv.
# Adjust setuptools-version specific ifs to check for setuptools version rather than Python version. # Adjust setuptools-version specific ifs to check for setuptools version rather than Python version.
# Ignore ResourceWarning: subprocess ... is still running (happens arbitrarily, possibly due to pytest-xdist usage) # Ignore ResourceWarning: subprocess ... is still running (happens arbitrarily, possibly due to pytest-xdist usage)
@ -103,12 +102,14 @@ Recommends: python3-devel
# Upstream updates dependencies too aggressively # Upstream updates dependencies too aggressively
# see https://github.com/tox-dev/tox/pull/2843#discussion_r1065028356 # see https://github.com/tox-dev/tox/pull/2843#discussion_r1065028356
# First, carefully adjust the pins of build and runtime dependencies, # First, carefully adjust the pins of build and runtime dependencies,
# then remove all the >= specifiers from tests deps, whatever they are. # then remove all the >= specifiers from tests deps, whatever they are,
# finally, remove undesired test dependencies.
sed -ri -e 's/"(packaging|filelock|platformdirs|pyproject-api|cachetools|hatch-vcs)>=.*/"\1",/g' \ sed -ri -e 's/"(packaging|filelock|platformdirs|pyproject-api|cachetools|hatch-vcs)>=.*/"\1",/g' \
-e 's/"(virtualenv)>=.*/"\1>=20.29",/g' \ -e 's/"(virtualenv)>=.*/"\1>=20.29",/g' \
-e 's/"(hatchling)>=.*/"\1>=1.13",/g' \ -e 's/"(hatchling)>=.*/"\1>=1.13",/g' \
-e 's/"(pluggy)>=.*/"\1>=1.5",/g' \ -e 's/"(pluggy)>=.*/"\1>=1.5",/g' \
-e '/^test = \[/,/^\]/ { s/>=[^;"]+// }' \ -e '/^test = \[/,/^\]/ { s/>=[^;"]+// }' \
-e '/^test = \[/,/^\]/ { /"(covdefaults|coverage|detect-test-pollution|devpi-process|diff-cover|pytest-cov)[;"]/d }' \
pyproject.toml pyproject.toml
%generate_buildrequires %generate_buildrequires