Handle change to pip._internal.req.InstallRequirement.install signature

Author: dwoz

relenv/runtime.py

@@ -613,7 +613,7 @@ def wrapper(*args, **kwargs):
                 return func(*args, **kwargs)
             base_dir = common().DATA_DIR / "toolchain"
             toolchain = base_dir / common().get_triplet()
-            cargo_home = str(common().DATA_DIR / "cargo")
+            cargo_home = install_cargo_config.tmpdir.name
             if not toolchain.exists():
                 debug("Unable to set CARGO_HOME no toolchain exists")
             else:
@@ -750,12 +750,38 @@ def wrap_req_install(name):
     mod = importlib.import_module(name)
 
     def wrap(func):
-        if mod.InstallRequirement.install.__code__.co_argcount == 9:
+        if mod.InstallRequirement.install.__code__.co_argcount == 7:
+            @functools.wraps(func)
+            def wrapper(
+                self,
+                root=None,
+                home=None,
+                prefix=None,
+                warn_script_location=True,
+                use_user_site=False,
+                pycompile=True,
+            ):
+                try:
+                    if TARGET.TARGET:
+                        TARGET.INSTALL = True
+                        home = TARGET.PATH
+                    return func(
+                        self,
+                        root,
+                        home,
+                        prefix,
+                        warn_script_location,
+                        use_user_site,
+                        pycompile,
+                    )
+                finally:
+                    TARGET.INSTALL = False
+
+        elif mod.InstallRequirement.install.__code__.co_argcount == 8:
 
             @functools.wraps(func)
             def wrapper(
                 self,
-                install_options,
                 global_options=None,
                 root=None,
                 home=None,
@@ -770,7 +796,6 @@ def wrapper(
                         home = TARGET.PATH
                     return func(
                         self,
-                        install_options,
                         global_options,
                         root,
                         home,
@@ -783,10 +808,12 @@ def wrapper(
                     TARGET.INSTALL = False
 
         else:
+            # Oldest version of this method sigature with 9 arguments.
 
             @functools.wraps(func)
             def wrapper(
                 self,
+                install_options,
                 global_options=None,
                 root=None,
                 home=None,
@@ -801,6 +828,7 @@ def wrapper(
                         home = TARGET.PATH
                     return func(
                         self,
+                        install_options,
                         global_options,
                         root,
                         home,
@@ -844,9 +872,13 @@ def install_cargo_config():
     # We need this as a late import for python < 3.12 becuase importing it will
     # load the ssl module. Causing out setup_openssl method to fail to load
     # fips module.
-    dirs = common().work_dirs()
+    import tempfile
+
+    install_cargo_config.tmpdir = tempfile.TemporaryDirectory(prefix="relenvcargo")
+    cargo_home = pathlib.Path(install_cargo_config.tmpdir.name)
+
     triplet = common().get_triplet()
-    cargo_home = dirs.data / "cargo"
+    # dirs = common().work_dirs()
 
     toolchain = common().get_toolchain()
     if not toolchain:

tests/test_verify_build.py

@@ -1859,3 +1859,26 @@ def test_import_ssl_module(pyexec):
     assert proc.returncode == 0
     assert proc.stdout.decode() == ""
     assert proc.stderr.decode() == ""
+
+
+@pytest.mark.skip_unless_on_linux
+@pytest.mark.parametrize("pip_version", ["25.2", "25.3"])
+def test_install_setuptools_25_2_to_25_3(pipexec, build, minor_version):
+    """
+    Validate we handle the changes to pip._internal.req.InstallRequirement.install signature.
+    """
+    subprocess.run(
+        [str(pipexec), "install", "--upgrade", "pip==25.2"],
+        check=True,
+    )
+    subprocess.run(
+        [
+            str(pipexec),
+            "install",
+            "--upgrade",
+            "--no-binary=:all:",
+            "--no-cache-dir",
+            "setuptools",
+        ],
+        check=True,
+    )