Fix pip target with latest pip

saltstack · Sep 14, 2024 · 79a2d70 · 79a2d70
1 parent 518194c
commit 79a2d70
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/relenv/runtime.py b/relenv/runtime.py
@@ -671,9 +671,15 @@ def wrapper(
         ):
             scheme = func(dist_name, user, home, root, isolated, prefix)
             if TARGET.TARGET and TARGET.INSTALL:
-                scheme.platlib = TARGET.PATH
-                scheme.purelib = TARGET.PATH
-                scheme.data = TARGET.PATH
+                from pip._internal.models.scheme import Scheme
+
+                scheme = Scheme(
+                    platlib=TARGET.PATH,
+                    purelib=TARGET.PATH,
+                    headers=scheme.headers,
+                    scripts=scheme.scripts,
+                    data=scheme.data,
+                )
             return scheme
 
         return wrapper

diff --git a/tests/test_verify_build.py b/tests/test_verify_build.py
@@ -1322,3 +1322,28 @@ def test_install_m2crypto(pipexec, build, minor_version):
     assert p.returncode == 0, "Failed install M2Crypto"
     assert (extras / "M2Crypto").exists()
     assert (extras / f"M2Crypto-{version}.dist-info").exists()
+
+
+@pytest.mark.skip_unless_on_linux
+def test_install_pyinotify_w_latest_pip(pipexec, build, minor_version):
+    p = subprocess.run(
+        [
+            str(pipexec),
+            "install",
+            "--upgrade",
+            "pip",
+        ]
+    )
+    extras = build / "extras"
+    p = subprocess.run(
+        [
+            str(pipexec),
+            "install",
+            "--no-cache-dir",
+            "--no-binary=:all:",
+            f"--target={extras}",
+            "pyinotify",
+        ]
+    )
+    assert p.returncode == 0, "Failed install pyinotify"
+    assert (extras / "pyinotify").exists()