at 24.11-pre 1.9 kB view raw
1--- a/conda/base/context.py 2+++ b/conda/base/context.py 3@@ -754,7 +754,7 @@ 4 5 @property 6 def conda_prefix(self): 7- return abspath(sys.prefix) 8+ return expand("~/.conda") 9 10 @property 11 @deprecated( 12@@ -787,28 +787,17 @@ 13 The vars can refer to each other if necessary since the dict is ordered. 14 None means unset it. 15 """ 16- if context.dev: 17- return { 18- "CONDA_EXE": sys.executable, 19- # do not confuse with os.path.join, we are joining paths with ; or : delimiters 20- "PYTHONPATH": os.pathsep.join( 21- (CONDA_SOURCE_ROOT, os.environ.get("PYTHONPATH", "")) 22- ), 23- "_CE_M": "-m", 24- "_CE_CONDA": "conda", 25- "CONDA_PYTHON_EXE": sys.executable, 26- } 27- else: 28- bin_dir = "Scripts" if on_win else "bin" 29- exe = "conda.exe" if on_win else "conda" 30- # I was going to use None to indicate a variable to unset, but that gets tricky with 31- # error-on-undefined. 32- return { 33- "CONDA_EXE": os.path.join(sys.prefix, bin_dir, exe), 34- "_CE_M": "", 35- "_CE_CONDA": "", 36- "CONDA_PYTHON_EXE": sys.executable, 37- } 38+ import sys 39+ return { 40+ "CONDA_EXE": sys.executable, 41+ # do not confuse with os.path.join, we are joining paths with ; or : delimiters 42+ "PYTHONPATH": os.pathsep.join( 43+ [CONDA_SOURCE_ROOT, os.environ.get("PYTHONPATH", "")] + [path for path in sys.path if "site-packages" in path] 44+ ), 45+ "_CE_M": "-m", 46+ "_CE_CONDA": "conda", 47+ "CONDA_PYTHON_EXE": sys.executable, 48+ } 49 50 @memoizedproperty 51 def channel_alias(self):