Merge 8e07e2a into master

Author: github-actions[bot]

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 7.1
+
+- Fixed: `call` command sometimes received incorrect `$PYTHONPATH` values on systems 
+  with multiple versions of Python
+
 # 7.0
 
 - The `create`, `call`, `delete`, `recreate` and `path` commands work on Windows.

tests/pythonpath_test.py

@@ -0,0 +1,45 @@
+import os
+import unittest
+
+from vien.main import _insert_into_pythonpath
+
+
+@unittest.skipUnless(os.name == 'posix', "posix colons format")
+class PythonPathTestPosix(unittest.TestCase):
+    def test_empty(self):
+        os.environ["PYTHONPATH"] = ''
+        self.assertEqual(_insert_into_pythonpath('/a/b/c'),
+                         '/a/b/c')
+
+    def test_empty_multiple(self):
+        os.environ["PYTHONPATH"] = ':::'
+        self.assertEqual(_insert_into_pythonpath('/a/b/c'),
+                         '/a/b/c')
+
+    def test_empties_skipped(self):
+        os.environ["PYTHONPATH"] = ':xx:::::yy:::'
+        self.assertEqual(_insert_into_pythonpath('/a/b/c'),
+                         '/a/b/c:xx:yy')
+
+    def test_duplicates_skipped(self):
+        os.environ["PYTHONPATH"] = 'aaa:bbb:ccc'
+        self.assertEqual(_insert_into_pythonpath('bbb'),
+                         'aaa:bbb:ccc')
+
+    def test_two(self):
+        os.environ["PYTHONPATH"] = ' /bbb/ccc :  /dd/ee/ff '
+        self.assertEqual(_insert_into_pythonpath('/a/b/c'),
+                         '/a/b/c:/bbb/ccc:/dd/ee/ff')
+
+
+@unittest.skipUnless(os.name == 'nt', "windows semicolons format")
+class PythonPathTestWindows(unittest.TestCase):
+    # most tests are done on POSIX. Here we just test ';' and 'C:/'
+    def test_two(self):
+        os.environ["PYTHONPATH"] = ' C:/ccc/33 ;  D:/ddd/44 '
+        self.assertEqual(_insert_into_pythonpath('E:/my/project'),
+                         'E:/my/project;C:/ccc/33;D:/ddd/44')
+
+
+if __name__ == "__main__":
+    unittest.main()

vien/constants.py

@@ -1,3 +1,3 @@
-__version__ = "7.0.1"
+__version__ = "7.1.0"
 __copyright__ = "(c) 2020-2021 Artëm IG <github.com/rtmigo>"
 __license__ = "BSD-3-Clause"

vien/main.py

@@ -337,7 +337,23 @@ def _insert_into_pythonpath(insert_me: str) -> str:
     # "The format is the same as the shell’s PATH: one or more directory
     # pathnames separated by os.pathsep (e.g. colons on Unix or semicolons
     # on Windows)"
-    return os.pathsep.join([insert_me] + sys.path)
+    ####
+    # $PYTHONPATH and sys.path are not the same.
+    # - sys.path contains directories used by the current interpreter
+    #   (the one that runs vien)
+    # - $PYTHONPATH is the variable to be used by all interpreters
+    #
+    # For example, if we run vien on Python 3.7 and trying to use venv with
+    # Python 3.9, we should not provide out own sys.path (3.7) to the child
+    # interpreter (3.9).
+
+    parts = [p.strip() for p in
+             os.environ.get("PYTHONPATH", '').split(os.pathsep)]
+    parts = [p for p in parts if p]
+
+    if insert_me not in parts:
+        parts.insert(0, insert_me)
+    return os.pathsep.join(parts)
 
 
 def child_env(proj_path: Path) -> Optional[Dict]:
@@ -355,6 +371,7 @@ def main_call(venv_dir: Path,
               proj_path: Path,
               other_args: List[str]):
     python_exe = venv_dir_to_python_exe(venv_dir)
+    # print("EXE",python_exe)
     assert len(other_args) > 0
     args = [str(python_exe)] + other_args