Merge pull request #720 from compas-dev/fixrpc

Prepend libs to path

Author: tomvanmele

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+* Changed `compas._os.prepare_environment` to prepend environment paths (fixes problem with RPC on windows).
+
 ### Removed
 
 

src/compas/_os.py

@@ -221,13 +221,13 @@ def prepare_environment(env=None):
         env = os.environ.copy()
 
     if PYTHON_DIRECTORY:
-        lib_bin = os.path.join(PYTHON_DIRECTORY, 'Library', 'bin')
-        if os.path.exists(lib_bin) and lib_bin not in env['PATH']:
-            env['PATH'] += os.pathsep + lib_bin
+        if is_windows():
+            lib_bin = os.path.join(PYTHON_DIRECTORY, 'Library', 'bin')
+        else:
+            lib_bin = os.path.join(PYTHON_DIRECTORY, 'bin')
 
-        lib_bin = os.path.join(PYTHON_DIRECTORY, 'lib')
         if os.path.exists(lib_bin) and lib_bin not in env['PATH']:
-            env['PATH'] += os.pathsep + lib_bin
+            env['PATH'] = lib_bin + os.pathsep + env['PATH']
 
     if CONDA_EXE:
         env['CONDA_EXE'] = CONDA_EXE