Skip to content

Commit b45bf5a

Browse files
committed
Fix usage on non-windows systems
1 parent a643b68 commit b45bf5a

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

a00_qpip/plugin.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ def __init__(self, iface):
3434
"python",
3535
"dependencies",
3636
)
37-
self.site_packages_path = os.path.join(self.prefix_path, "Lib", "site-packages")
38-
self.bin_path = os.path.join(self.prefix_path, "Scripts")
37+
self.site_packages_path = os.path.join(self.prefix_path)
38+
self.bin_path = os.path.join(self.prefix_path, "bin")
3939

4040
if self.site_packages_path not in sys.path:
4141
log(f"Adding {self.site_packages_path} to PYTHONPATH")
4242
sys.path.insert(0, self.site_packages_path)
4343
os.environ["PYTHONPATH"] = (
44-
self.site_packages_path + ";" + os.environ.get("PYTHONPATH", "")
44+
self.site_packages_path + os.pathsep + os.environ.get("PYTHONPATH", "")
4545
)
4646

4747
if self.bin_path not in os.environ["PATH"]:
4848
log(f"Adding {self.bin_path} to PATH")
49-
os.environ["PATH"] = self.bin_path + ";" + os.environ["PATH"]
49+
os.environ["PATH"] = self.bin_path + os.pathsep + os.environ["PATH"]
5050

5151
sys.path_importer_cache.clear()
5252

@@ -89,9 +89,9 @@ def unload(self):
8989
if self.site_packages_path in sys.path:
9090
sys.path.remove(self.site_packages_path)
9191
os.environ["PYTHONPATH"] = os.environ["PYTHONPATH"].replace(
92-
self.bin_path + ";", ""
92+
self.bin_path + os.pathsep, ""
9393
)
94-
os.environ["PATH"] = os.environ["PATH"].replace(self.bin_path + ";", "")
94+
os.environ["PATH"] = os.environ["PATH"].replace(self.bin_path + os.pathsep, "")
9595

9696
def patched_load_plugin(self, packageName):
9797
"""
@@ -242,7 +242,7 @@ def pip_install_reqs(self, reqs_to_install):
242242
"pip",
243243
"install",
244244
*reqs_to_install,
245-
"--prefix",
245+
"--target",
246246
self.prefix_path,
247247
],
248248
f"installing {len(reqs_to_install)} requirements",

0 commit comments

Comments
 (0)