Skip tests that use pyenv Python 2.7 on Windows. (#2705)

More work towards #2658.

testing/__init__.py

@@ -15,6 +15,8 @@
 from contextlib import contextmanager
 from textwrap import dedent
 
+import pytest
+
 from pex.atomic_directory import atomic_directory
 from pex.common import open_zip, safe_mkdir, safe_mkdtemp, safe_rmtree, safe_sleep, temporary_dir
 from pex.dist_metadata import Distribution
@@ -608,10 +610,12 @@ def ensure_python_distribution(version):
     if version not in ALL_PY_VERSIONS:
         raise ValueError("Please constrain version to one of {}".format(ALL_PY_VERSIONS))
 
-    assert not WINDOWS or _ALL_PY_VERSIONS_TO_VERSION_INFO[version][:2] >= (
-        3,
-        8,
-    ), "Test uses pyenv {} interpreter which is not supported on Windows.".format(version)
+    if WINDOWS and _ALL_PY_VERSIONS_TO_VERSION_INFO[version][:2] < (3, 8):
+        pytest.skip(
+            "Test uses pyenv {version} interpreter which is not supported on Windows.".format(
+                version=version
+            )
+        )
 
     clone_dir = os.path.abspath(
         os.path.join(PEX_TEST_DEV_ROOT, "pyenv-win" if WINDOWS else "pyenv")

testing/bin/run_tests.py

@@ -160,7 +160,7 @@ def main():
 
     args = [sys.executable, "-m", "pytest", "-n", "auto"]
     if options.it:
-        args.extend(["tests/integration", "-p", "testing.pytest.shard"])
+        args.extend(["tests/integration", "-p", "testing.pytest_utils.shard"])
     else:
         args.extend(["tests", "--ignore", "tests/integration"])
     args.extend(passthrough_args or ["-vvs"])

testing/pytest/track_status_hook.py → testing/pytest_utils/track_status_hook.py

@@ -7,7 +7,7 @@
 
 from pex.compatibility import PY2
 from pex.typing import TYPE_CHECKING
-from testing.pytest.tmp import RetentionPolicy
+from testing.pytest_utils.tmp import RetentionPolicy
 
 if TYPE_CHECKING:
     from typing import Dict
@@ -32,9 +32,9 @@ def passed(node):
 
 
 if PY2:
-    from testing.pytest.track_status_hook_py2 import track_status_hook as _track_status_hook
+    from testing.pytest_utils.track_status_hook_py2 import track_status_hook as _track_status_hook
 else:
-    from testing.pytest.track_status_hook_py3 import track_status_hook as _track_status_hook
+    from testing.pytest_utils.track_status_hook_py3 import track_status_hook as _track_status_hook
 
 hook = _track_status_hook
 

testing/pytest/track_status_hook_py2.py → testing/pytest_utils/track_status_hook_py2.py

@@ -21,7 +21,7 @@ def track_status_hook(
 ):
     # type: (...) -> Generator[None, _Result, None]
 
-    from testing.pytest.track_status_hook import mark_passed
+    from testing.pytest_utils.track_status_hook import mark_passed
 
     report = yield
     result = report.get_result()

testing/pytest/track_status_hook_py3.py → testing/pytest_utils/track_status_hook_py3.py

@@ -23,7 +23,7 @@ def track_status_hook(
 ):
     # type: (...) -> Generator[None, TestReport, TestReport]
 
-    from testing.pytest.track_status_hook import mark_passed
+    from testing.pytest_utils.track_status_hook import mark_passed
 
     report = yield
     if sys.version_info[:2] < (3, 7):

tests/conftest.py

@@ -15,7 +15,7 @@
 from pex.platforms import Platform
 from pex.typing import TYPE_CHECKING
 from testing import PY27, PY38, PY39, PY310, ensure_python_interpreter
-from testing.pytest import tmp, track_status_hook
+from testing.pytest_utils import tmp, track_status_hook
 
 if TYPE_CHECKING:
     from typing import Iterator

tests/integration/cli/commands/test_cache_prune.py

@@ -34,7 +34,7 @@
 from pex.variables import ENV
 from testing import run_pex_command, subprocess
 from testing.cli import run_pex3
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 if TYPE_CHECKING:
     from typing import Iterable, Iterator, Optional

tests/integration/cli/commands/test_issue_1413.py

@@ -16,7 +16,7 @@
 from pex.typing import TYPE_CHECKING
 from testing import make_env, run_pex_command, subprocess
 from testing.cli import run_pex3
-from testing.pytest.tmp import Tempdir, TempdirFactory
+from testing.pytest_utils.tmp import Tempdir, TempdirFactory
 
 if TYPE_CHECKING:
     from typing import Any

tests/integration/cli/commands/test_issue_2098.py

@@ -10,7 +10,7 @@
 from pex.interpreter import PythonInterpreter
 from testing import run_pex_command
 from testing.cli import run_pex3
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 
 def test_missing_download_lock_analysis_handling(

tests/integration/cli/commands/test_lock_dependency_groups.py

@@ -13,7 +13,7 @@
 from pex.resolve.lockfile import json_codec
 from pex.sorted_tuple import SortedTuple
 from testing.cli import run_pex3
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 req = Requirement.parse
 

tests/integration/cli/commands/test_lock_elide_unused_requires_dist.py

@@ -10,7 +10,7 @@
 from pex.resolve.lockfile import json_codec
 from pex.resolve.lockfile.model import Lockfile
 from testing.cli import run_pex3
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 
 def index_locked_reqs(lockfile):

tests/integration/cli/commands/test_lock_resolve_auth.py

@@ -17,7 +17,7 @@
 from pex.typing import TYPE_CHECKING
 from testing import IntegResults, make_env, run_pex_command
 from testing.cli import run_pex3
-from testing.pytest.tmp import TempdirFactory
+from testing.pytest_utils.tmp import TempdirFactory
 
 if TYPE_CHECKING:
     from typing import Any, Iterator

tests/integration/cli/commands/test_lock_script_metadata.py

@@ -13,7 +13,7 @@
 from pex.typing import TYPE_CHECKING
 from testing import run_pex_command
 from testing.cli import run_pex3
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 if TYPE_CHECKING:
     from typing import Union

tests/integration/cli/commands/test_lock_subset.py

@@ -19,7 +19,7 @@
 from pex.sorted_tuple import SortedTuple
 from testing import PY_VER, data
 from testing.cli import run_pex3
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 
 @pytest.fixture(scope="session")

tests/integration/cli/commands/test_venv_create.py

@@ -34,7 +34,7 @@
     subprocess,
 )
 from testing.cli import run_pex3
-from testing.pytest.tmp import Tempdir, TempdirFactory
+from testing.pytest_utils.tmp import Tempdir, TempdirFactory
 
 if TYPE_CHECKING:
     from typing import Any

tests/integration/resolve/test_dependency_groups.py

@@ -13,7 +13,7 @@
 from pex.pep_503 import ProjectName
 from pex.pex import PEX
 from testing import run_pex_command, subprocess
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 
 def test_pex_from_dependency_groups(tmpdir):

tests/integration/resolve/test_issue_2568.py

@@ -8,7 +8,7 @@
 
 from pex import targets
 from testing.cli import run_pex3
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 
 def test_independent_logs_for_independent_runs(tmpdir):

tests/integration/test_excludes.py

@@ -30,7 +30,7 @@
 from testing import PY_VER, IntegResults, data, make_env, run_pex_command, subprocess
 from testing.cli import run_pex3
 from testing.lock import extract_lock_option_args, index_lock_artifacts
-from testing.pytest.tmp import Tempdir, TempdirFactory
+from testing.pytest_utils.tmp import Tempdir, TempdirFactory
 
 if TYPE_CHECKING:
     from typing import Any

tests/integration/test_integration.py

@@ -57,7 +57,7 @@
 )
 from testing.mitmproxy import Proxy
 from testing.pep_427 import get_installable_type_flag
-from testing.pytest import IS_CI
+from testing.pytest_utils import IS_CI
 
 if TYPE_CHECKING:
     from typing import Any, Callable, Iterator, List, Optional, Tuple

tests/integration/test_issue_1560.py

@@ -17,7 +17,7 @@
     run_pex_command,
     subprocess,
 )
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 from testing.pythonPI import skip_flit_core_39
 
 if TYPE_CHECKING:

tests/integration/test_issue_1656.py

@@ -10,7 +10,7 @@
 from pex.pex_info import PexInfo
 from pex.typing import TYPE_CHECKING
 from testing import IS_PYPY, PY_VER, make_env, run_pex_command, subprocess
-from testing.pytest.tmp import TempdirFactory
+from testing.pytest_utils.tmp import TempdirFactory
 
 if TYPE_CHECKING:
     from typing import Any, List, Text

tests/integration/test_issue_2572.py

@@ -8,7 +8,7 @@
 
 from pex.fs import safe_symlink
 from testing import make_env, run_pex_command, subprocess
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 
 def test_symlinked_home(tmpdir):

tests/integration/test_issue_996.py

@@ -18,7 +18,7 @@
     run_pex_command,
     subprocess,
 )
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 if TYPE_CHECKING:
     from typing import List

tests/integration/test_lock_resolver.py

@@ -25,7 +25,7 @@
 from testing import IS_PYPY, PY_VER, built_wheel, make_env, run_pex_command, subprocess
 from testing.cli import run_pex3
 from testing.lock import index_lock_artifacts
-from testing.pytest.tmp import Tempdir, TempdirFactory
+from testing.pytest_utils.tmp import Tempdir, TempdirFactory
 
 if TYPE_CHECKING:
     from typing import Any, Mapping, Tuple

tests/integration/test_pex_bootstrapper.py

@@ -28,7 +28,7 @@
     run_pex_command,
     subprocess,
 )
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 if TYPE_CHECKING:
     from typing import Any, List, Optional, Set, Text

tests/integration/test_reproducible.py

@@ -33,7 +33,7 @@
     run_commands_with_jitter,
 )
 from testing.cli import run_pex3
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 if TYPE_CHECKING:
     from typing import Iterable, List, Optional, Tuple

tests/integration/test_sh_boot.py

@@ -14,7 +14,7 @@
 from pex.os import WINDOWS
 from pex.typing import TYPE_CHECKING
 from testing import all_pythons, make_env, run_pex_command, subprocess
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 if TYPE_CHECKING:
     from typing import Any, Iterable, Iterator, List, Text, Tuple

tests/integration/tools/commands/test_issue_2105.py

@@ -13,7 +13,7 @@
 from pex.typing import TYPE_CHECKING
 from pex.venv.virtualenv import InstallationChoice, Virtualenv
 from testing import make_env, run_pex_command, subprocess
-from testing.pytest.tmp import Tempdir, TempdirFactory
+from testing.pytest_utils.tmp import Tempdir, TempdirFactory
 
 if TYPE_CHECKING:
     from typing import Any, Iterable, Mapping, Optional

tests/resolve/test_dependency_groups.py

@@ -17,7 +17,7 @@
 from pex.resolve import project
 from pex.typing import cast
 from testing import pushd
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 
 def create_dependency_groups_project(

tests/resolve/test_script_metadata.py

@@ -15,7 +15,7 @@
 from pex.resolve.resolvers import Unsatisfiable
 from pex.resolve.target_configuration import InterpreterConfiguration, TargetConfiguration
 from pex.third_party.packaging.specifiers import SpecifierSet
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 
 @pytest.fixture

tests/test_executables.py

@@ -14,7 +14,7 @@
 from pex.os import WINDOWS, is_exe
 from pex.pep_427 import install_wheel_interpreter
 from pex.venv.virtualenv import InstallationChoice, Virtualenv
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 
 @pytest.mark.skipif(WINDOWS, reason="This test checks posix expectations of a script.")

tests/test_interpreter.py

@@ -36,7 +36,7 @@
     pushd,
     subprocess,
 )
-from testing.pytest.tmp import TempdirFactory
+from testing.pytest_utils.tmp import TempdirFactory
 
 try:
     from unittest.mock import Mock, patch  # type: ignore[import]

tests/test_os.py

@@ -8,7 +8,7 @@
 from pex.common import touch
 from pex.executables import chmod_plus_x
 from pex.os import is_exe
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 
 def test_is_exe(tmpdir):

tests/test_pex_info.py

@@ -15,7 +15,7 @@
 from pex.typing import TYPE_CHECKING
 from pex.variables import Variables
 from pex.version import __version__ as pex_version
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 if TYPE_CHECKING:
     from typing import Dict, List, Text

tests/test_pip.py

@@ -32,7 +32,7 @@
 from pex.variables import ENV
 from pex.venv.virtualenv import Virtualenv
 from testing import IS_LINUX, PY310, ensure_python_interpreter
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 if TYPE_CHECKING:
     from typing import Any, Iterable, Iterator, Optional, Protocol

tests/test_variables.py

@@ -13,7 +13,7 @@
 from pex.typing import TYPE_CHECKING
 from pex.util import named_temporary_file
 from pex.variables import NoValueError, Variables
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 if TYPE_CHECKING:
     from typing import Any

tests/test_windows.py

@@ -5,7 +5,7 @@
 
 from pex import windows
 from pex.sysconfig import SysPlatform
-from testing.pytest.tmp import Tempdir
+from testing.pytest_utils.tmp import Tempdir
 
 
 def test_is_script(tmpdir):