Skip to content

Prepend libs to path #720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 17, 2020
Merged

Prepend libs to path #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50451de
Prepend libs to path
tomvanmele Dec 16, 2020
fc7a642
log
tomvanmele Dec 16, 2020
c6f3f84
conditional path only
tomvanmele Dec 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
10 changes: 5 additions & 5 deletions src/compas/_os.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down