|
8 | 8 | from pathlib import Path
|
9 | 9 | from subprocess import check_call
|
10 | 10 | from typing import Callable, Iterator
|
| 11 | +from unittest import mock |
11 | 12 | from zipfile import ZipFile
|
12 | 13 |
|
13 | 14 | import pytest
|
14 | 15 | from devpi_process import Index, IndexServer
|
15 | 16 | from filelock import FileLock
|
16 | 17 | from packaging.requirements import Requirement
|
17 |
| -from packaging.version import Version |
18 | 18 |
|
19 |
| -from tox import __version__ |
20 | 19 | from tox.pytest import MonkeyPatch, TempPathFactory, ToxProjectCreator
|
21 | 20 |
|
22 | 21 | if sys.version_info >= (3, 8): # pragma: no cover (py38+)
|
@@ -61,14 +60,11 @@ def _make_tox_wheel(
|
61 | 60 | pkg_builder: Callable[[Path, Path, list[str], bool], Path],
|
62 | 61 | ) -> Path:
|
63 | 62 | with elapsed("acquire current tox wheel"): # takes around 3.2s on build
|
64 |
| - package: Path | None = None |
65 |
| - if "TOX_PACKAGE" in os.environ: |
66 |
| - env_tox_pkg = Path(os.environ["TOX_PACKAGE"]) # pragma: no cover |
67 |
| - if env_tox_pkg.exists() and env_tox_pkg.suffix == ".whl": # pragma: no cover |
68 |
| - package = env_tox_pkg # pragma: no cover |
69 |
| - if package is None: |
70 |
| - # when we don't get a wheel path injected, build it (for example when running from an IDE) |
71 |
| - into = tmp_path_factory.mktemp("dist") # pragma: no cover |
| 63 | + into = tmp_path_factory.mktemp("dist") # pragma: no cover |
| 64 | + from tox.version import version_tuple |
| 65 | + |
| 66 | + version = f"{version_tuple[0]}.{version_tuple[1]}.{version_tuple[2] +1}" |
| 67 | + with mock.patch.dict(os.environ, {"SETUPTOOLS_SCM_PRETEND_VERSION": version}): |
72 | 68 | package = pkg_builder(into, Path(__file__).parents[1], ["wheel"], False) # pragma: no cover
|
73 | 69 | return package
|
74 | 70 |
|
@@ -189,5 +185,4 @@ def test_provision_no_recreate_json(tox_project: ToxProjectCreator) -> None:
|
189 | 185 | assert msg in result.out
|
190 | 186 | with (project.path / "out.json").open() as file_handler:
|
191 | 187 | requires = json.load(file_handler)
|
192 |
| - version = Version(__version__).base_version |
193 |
| - assert requires == {"minversion": version, "requires": ["p", f"tox>={version}"]} |
| 188 | + assert requires == {"minversion": "4.0", "requires": ["p", "tox>=4.0"]} |
0 commit comments