Update tests failing the Pip nightly adhoc job. (#3058)

Author: jsirois

pex/pip/version.py

@@ -118,7 +118,7 @@ def requirements(self):
 
     @property
     def build_system_requires(self):
-        # type: () -> Iterable[Requirement]
+        # type: () -> Tuple[Requirement, ...]
         return ()
 
     def requires_python_applies(self, target=None):
@@ -251,7 +251,7 @@ def requirement(self):
 
     @property
     def build_system_requires(self):
-        # type: () -> Iterable[Requirement]
+        # type: () -> Tuple[Requirement, ...]
         build_system_requires = os.environ.get("_PEX_PIP_ADHOC_BUILD_SYSTEM_REQUIRES")
         if not build_system_requires:
             return ()

tests/integration/cli/commands/test_lock_resolve_auth.py

@@ -83,7 +83,9 @@ def ansicolors_and_pip_find_links_directory(
 
     requirements = ["ansicolors==1.1.8"]
     if PipVersion.DEFAULT is not PipVersion.VENDORED:
-        requirements.extend(map(str, PipVersion.DEFAULT.requirements))
+        requirements.extend(
+            map(str, PipVersion.DEFAULT.requirements + PipVersion.DEFAULT.build_system_requires)
+        )
 
     run_pex_command(
         args=(

tests/integration/cli/commands/test_split_universal_locks.py

@@ -275,7 +275,9 @@ def test_split_repos_lock(
             str(PipVersion.VENDORED.wheel_requirement),
         ]
     else:
-        requirements = list(map(str, PipVersion.DEFAULT.requirements))
+        requirements = list(
+            map(str, PipVersion.DEFAULT.requirements + PipVersion.DEFAULT.build_system_requires)
+        )
     downloaded = resolver.download(requirements=requirements)
     for dist in downloaded.local_distributions:
         shutil.copy(dist.path, find_links)

tests/integration/resolve/test_issue_1907.py

@@ -173,7 +173,12 @@ def test_pre_resolved_dists_offline(
         if PipVersion.DEFAULT is not PipVersion.VENDORED:
             # In order to go offline and still be able to build sdists, we need both the un-vendored Pip and
             # its basic build requirements.
-            args.extend(str(req) for req in PipVersion.DEFAULT.requirements)
+            args.extend(
+                str(req)
+                for req in (
+                    PipVersion.DEFAULT.requirements + PipVersion.DEFAULT.build_system_requires
+                )
+            )
         if IS_PYPY:
             # For PyPy, we need extra build dependencies for argon2-cffi-bindings.
             args.append("setuptools_scm")

tests/integration/resolve/test_issue_3040.py

@@ -7,6 +7,8 @@
 import subprocess
 import sys
 
+import pytest
+
 from pex.common import safe_mkdir
 from pex.interpreter import PythonInterpreter
 from pex.pep_440 import Version
@@ -18,6 +20,10 @@
 from testing.pytest_utils.tmp import Tempdir
 
 
+@pytest.mark.skipif(
+    PipVersion.DEFAULT is PipVersion.ADHOC,
+    reason="Adhoc pip requires a git clone and we run the container under test with no network.",
+)
 @skip_unless_docker
 def test_pip_bootstrap_respects_pip_configuration(
     tmpdir,  # type: Tempdir

tests/integration/test_excludes.py

@@ -328,7 +328,16 @@ def test_exclude_deep(
     # Bootstrap the Pip version being used if needed before we turn off PyPI.
     if pip_options.pip_version is not PipVersion.VENDORED:
         subprocess.check_call(
-            [pip, "wheel", "-w", find_links] + list(map(str, pip_options.pip_version.requirements))
+            [pip, "wheel", "-w", find_links]
+            + list(
+                map(
+                    str,
+                    (
+                        pip_options.pip_version.requirements
+                        + pip_options.pip_version.build_system_requires
+                    ),
+                )
+            )
         )
 
     project_dir = tmpdir.join("projects")

tests/integration/test_issue_2706.py

@@ -26,7 +26,9 @@ def test_extras_from_dup_root_reqs(tmpdir):
             tmpdir.join("pip-resolver-venv"), install_pip=InstallationChoice.YES
         ).interpreter.execute(
             args=["-m", "pip", "wheel", "--wheel-dir", find_links]
-            + list(map(str, PipVersion.DEFAULT.requirements))
+            + list(
+                map(str, PipVersion.DEFAULT.requirements + PipVersion.DEFAULT.build_system_requires)
+            )
         )
 
     with built_wheel(

tests/integration/test_scoped_repos.py

@@ -550,7 +550,9 @@ def test_scoped_marker(
                 str(PipVersion.VENDORED.wheel_requirement),
             ]
         else:
-            requirements = list(map(str, PipVersion.DEFAULT.requirements))
+            requirements = list(
+                map(str, PipVersion.DEFAULT.requirements + PipVersion.DEFAULT.build_system_requires)
+            )
         downloaded = resolver.download(requirements=requirements)
         for dist in downloaded.local_distributions:
             shutil.copy(dist.path, find_links)