diff --git a/fix-tests.patch b/fix-tests.patch index 332089a..7dd7a1f 100644 --- a/fix-tests.patch +++ b/fix-tests.patch @@ -1,19 +1,48 @@ -From 1ade3df7eaefad792a2a519c0f3cc3a8f28a5829 Mon Sep 17 00:00:00 2001 +From 156ff454c8df051b2cb3a6b5283810c51c1d5853 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 10 Jan 2023 08:34:25 +0100 -Subject: [PATCH] fix tests +Subject: [PATCH] Fix tests +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Co-Authored-By: Miro HronĨok --- - pyproject.toml | 8 -------- - src/tox/pytest.py | 16 +++------------- - tests/test_provision.py | 18 ++---------------- - 3 files changed, 5 insertions(+), 37 deletions(-) + pyproject.toml | 11 +---------- + src/tox/pytest.py | 16 +++------------- + tests/test_provision.py | 18 ++---------------- + .../package/test_python_package_util.py | 10 ++++++++-- + 4 files changed, 14 insertions(+), 41 deletions(-) diff --git a/pyproject.toml b/pyproject.toml -index 74219b1..6cd2da8 100644 +index 16f2e44..156d1af 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -167,9 +167,6 @@ report.omit = [ +@@ -82,22 +82,16 @@ dev = [ + ] + test = [ + "build[virtualenv]>=1.2.2.post1", +- "covdefaults>=2.3", +- "detect-test-pollution>=1.2", +- "devpi-process>=1.0.2", +- "diff-cover>=9.2", + "distlib>=0.3.9", + "flaky>=3.8.1", + "hatch-vcs>=0.4", + "hatchling>=1.26.3", + "psutil>=6.1", + "pytest>=8.3.3", +- "pytest-cov>=5", + "pytest-mock>=3.14", + "pytest-xdist>=3.6.1", + "re-assert>=1.1", +- "setuptools>=75.1; python_version<='3.8'", +- "setuptools>=75.6; python_version>'3.8'", ++ "setuptools>=75.1", + "time-machine>=2.15; implementation_name!='pypy'", + "wheel>=0.45", + ] +@@ -223,9 +217,6 @@ report.omit = [ "tests/type_check/*", ] run.parallel = true @@ -23,26 +52,8 @@ index 74219b1..6cd2da8 100644 [tool.towncrier] name = "tox" -@@ -229,17 +226,12 @@ release = [ - ] - test = [ - "build[virtualenv]>=1.2.2", -- "covdefaults>=2.3", -- "detect-test-pollution>=1.2", -- "devpi-process>=1.0.2", -- "diff-cover>=9.2", - "distlib>=0.3.8", - "flaky>=3.8.1", - "hatch-vcs>=0.4", - "hatchling>=1.25", - "psutil>=6", - "pytest>=8.3.3", -- "pytest-cov>=5", - "pytest-mock>=3.14", - "pytest-xdist>=3.6.1", - "re-assert>=1.1", diff --git a/src/tox/pytest.py b/src/tox/pytest.py -index ca42a5b..183e2f4 100644 +index 72f410b..48cf9bc 100644 --- a/src/tox/pytest.py +++ b/src/tox/pytest.py @@ -17,7 +17,6 @@ from typing import TYPE_CHECKING, Any, Callable, Iterator, Protocol, Sequence, c @@ -83,7 +94,7 @@ index ca42a5b..183e2f4 100644 def _invalid_index_fake_port() -> int: with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as socket_handler: diff --git a/tests/test_provision.py b/tests/test_provision.py -index 5b2b652..7657c2e 100644 +index 2030cb9..f706d6c 100644 --- a/tests/test_provision.py +++ b/tests/test_provision.py @@ -98,22 +98,9 @@ def tox_wheels(tox_wheel: Path, tmp_path_factory: TempPathFactory) -> list[Path] @@ -119,6 +130,36 @@ index 5b2b652..7657c2e 100644 def test_provision_platform_check(tox_project: ToxProjectCreator) -> None: ini = "[tox]\nrequires=demo-pkg-inline\n[testenv]\npackage=skip\n[testenv:.tox]\nplatform=wrong_platform" proj = tox_project({"tox.ini": ini}) +diff --git a/tests/tox_env/python/virtual_env/package/test_python_package_util.py b/tests/tox_env/python/virtual_env/package/test_python_package_util.py +index efb5b12..8a57426 100644 +--- a/tests/tox_env/python/virtual_env/package/test_python_package_util.py ++++ b/tests/tox_env/python/virtual_env/package/test_python_package_util.py +@@ -15,6 +15,12 @@ if TYPE_CHECKING: + + from importlib.metadata import Distribution, PathDistribution + ++from importlib.metadata import version ++from packaging.version import Version ++ ++SETUPTOOLS_VERSION = Version(version("setuptools")) ++SETUPTOOLS_75_6 = SETUPTOOLS_VERSION >= Version("75.6") ++ + + @pytest.fixture(scope="session") + def pkg_with_extras(pkg_with_extras_project: Path) -> PathDistribution: +@@ -43,10 +49,10 @@ def test_load_dependency_many_extra(pkg_with_extras: PathDistribution) -> None: + exp = [ + Requirement("platformdirs>=2.1"), + Requirement("colorama>=0.4.3"), +- *(sphinx if sys.version_info[0:2] <= (3, 8) else []), ++ *(sphinx if not SETUPTOOLS_75_6 else []), + Requirement(f'covdefaults>=1.2; python_version == "2.7" or python_version == "{py_ver}"'), + Requirement(f'pytest>=5.4.1; python_version == "{py_ver}"'), +- *(sphinx if sys.version_info[0:2] > (3, 8) else []), ++ *(sphinx if SETUPTOOLS_75_6 else []), + ] + for left, right in zip_longest(result, exp): + assert isinstance(right, Requirement) -- -2.47.0 +2.47.1 diff --git a/python-tox.spec b/python-tox.spec index 4f35d51..a59d8cf 100644 --- a/python-tox.spec +++ b/python-tox.spec @@ -20,7 +20,7 @@ %undefine _py3_shebang_s Name: python-tox -Version: 4.23.2 +Version: 4.24.1 Release: %autorelease Summary: Virtualenv-based automation of test activities @@ -32,6 +32,7 @@ Source: %{pypi_source tox} # Remove dependency on detect-test-pollution. # Remove coverage-related dependencies. # 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. Patch: fix-tests.patch BuildArch: noarch diff --git a/sources b/sources index 96691d9..0d42bbf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tox-4.23.2.tar.gz) = 5008964ebed3c94a6ad5f0985150c7bf73fd3996b91171b16323d195bf0288102aac0dc38848bd4c63e5c5678ab1a82c170579139eda97132a4555eb11d381a0 +SHA512 (tox-4.24.1.tar.gz) = 8d7a3cd9c6140463dd2d2e1df7845c676f750ca23c0a9d528ee4fc7923bcadea94cfc0e7a1d70bd436d867be5f2edddd1576569777f2c15a0e11768cd932b6dd