Skip to content

Commit a9d6812

Browse files
committed
Remove experimental change, update CHANGES.txt
1 parent 53a0f09 commit a9d6812

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

CHANGES.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2017-01-23: 1.4.4:
2+
------------------
3+
* Set CONDA_PREFIX environment variable in cwp.py, fix PATH
4+
5+
16
2017-01-19: 1.4.3:
27
------------------
38
* fix fallback to user-mode shortcut if elevation denied, #39

cwp.py

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# this script is used on windows to wrap shortcuts so that they are executed within an environment
22
# It only sets the appropriate prefix PATH entries - it does not actually activate environments
33

4-
from os
4+
import os
55
import sys
66
import subprocess
77
from os.path import join, pathsep
@@ -18,20 +18,6 @@
1818
join(prefix, "Library", "usr", "bin"),
1919
join(prefix, "Library", "bin"),
2020
join(prefix, "Scripts")])
21-
22-
# Option 2 + 3 (in the try: block) requires a change to conda:
23-
# https://github.com/conda/conda/pull/4406
24-
# so option 3 is for older condas, but
25-
# hardcoding is going to be faster.
26-
# try:
27-
# from conda.cli.activate import get_activate_path
28-
# new_paths = get_activate_path(prefix, 'cmd.exe')
29-
# except:
30-
# # Option 3 (I do not like hacking creationflags here)
31-
# CREATE_NO_WINDOW=0x08000000
32-
# new_paths = str(subprocess.check_output([join(prefix, "Scripts", "conda"), '..activate', 'cmd.exe', prefix],
33-
# creationflags=CREATE_NO_WINDOW))
34-
3521
env = os.environ.copy()
3622
env['PATH'] = new_paths + pathsep + env['PATH']
3723
env['CONDA_PREFIX'] = prefix

0 commit comments

Comments
 (0)