Set CONDA_PREFIX on wrappers to make them compatible with conda>=4.1

gqmelo · Sep 29, 2016 · 5e264b0 · 5e264b0
1 parent 54c0f4f
commit 5e264b0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/exec_wrappers/create_wrappers.py b/exec_wrappers/create_wrappers.py
@@ -138,12 +138,18 @@ def create_conda_wrappers(files_to_wrap, destination_dir, inline, conda_env_dir)
 
     run_in_template_filename = os.path.join(this_dir, 'templates', 'conda', 'run-in' +
                                             get_wrapper_extension())
+
+    def template_function(content):
+        content = content.replace('__CONDA_PREFIX__', conda_env_dir)
+        content = content.replace('__CONDA_DEFAULT_ENV__', os.path.basename(conda_env_dir))
+        return content
+
     _create_wrappers(
         files_to_wrap,
         destination_dir,
         run_in_template_filename,
         inline,
-        lambda content: content.replace('__CONDA_ENV_DIR__', conda_env_dir),
+        template_function,
     )
 
 

diff --git a/exec_wrappers/templates/conda/run-in b/exec_wrappers/templates/conda/run-in
@@ -7,9 +7,10 @@ run_activate_scripts() {
     fi
 }
 
-export CONDA_DEFAULT_ENV="__CONDA_ENV_DIR__"
-export CONDA_ENV_PATH="$CONDA_DEFAULT_ENV"
+export CONDA_PREFIX="__CONDA_PREFIX__"
+export CONDA_DEFAULT_ENV="__CONDA_DEFAULT_ENV__"
+export CONDA_ENV_PATH="$CONDA_PREFIX"
 
-export PATH="$CONDA_DEFAULT_ENV/bin:$PATH"
-run_activate_scripts "$CONDA_DEFAULT_ENV/etc/conda/activate.d" &&
+export PATH="$CONDA_PREFIX/bin:$PATH"
+run_activate_scripts "$CONDA_PREFIX/etc/conda/activate.d" &&
 __COMMAND__"$@"
diff --git a/exec_wrappers/templates/conda/run-in.bat b/exec_wrappers/templates/conda/run-in.bat
@@ -4,12 +4,14 @@
 
 @setlocal
 
-@set "CONDA_DEFAULT_ENV=__CONDA_ENV_DIR__"
-@set "PATH=%CONDA_DEFAULT_ENV%;%CONDA_DEFAULT_ENV%\Scripts;%CONDA_DEFAULT_ENV%\Library\bin;%PATH%"
+@set "CONDA_PREFIX=__CONDA_PREFIX__"
+@set "CONDA_DEFAULT_ENV=__CONDA_DEFAULT_ENV__"
+@set "CONDA_ENV_PATH=%CONDA_PREFIX%"
+@set "PATH=%CONDA_PREFIX%;%CONDA_PREFIX%\Scripts;%CONDA_PREFIX%\Library\bin;%PATH%"
 
 @REM Run any activate scripts
-@if exist "%CONDA_DEFAULT_ENV%\etc\conda\activate.d" (
-    @pushd "%CONDA_DEFAULT_ENV%\etc\conda\activate.d"
+@if exist "%CONDA_PREFIX%\etc\conda\activate.d" (
+    @pushd "%CONDA_PREFIX%\etc\conda\activate.d"
     @for %%g in (*.bat) do @call "%%g"
     @popd
 )

diff --git a/tests/test_create_wrappers.py b/tests/test_create_wrappers.py
@@ -1,9 +1,9 @@
 import os
-import pytest
-
 import stat
 import sys
 
+import pytest
+
 from exec_wrappers import create_wrappers
 from exec_wrappers.create_wrappers import list_executable_files, create_conda_wrappers, \
     create_schroot_wrappers, get_templates_dir, get_wrapper_extension
@@ -246,7 +246,8 @@ def test_dont_create_wrapper_when_file_has_same_name(tmpdir):
 
     with open(os.path.join(get_templates_dir(), 'conda', 'run-in' + get_wrapper_extension())) as f:
         expected_run_in_content = f.read() \
-                                   .replace('__CONDA_ENV_DIR__', 'miniconda/envs/test') \
+                                   .replace('__CONDA_PREFIX__', 'miniconda/envs/test') \
+                                   .replace('__CONDA_DEFAULT_ENV__', 'test') \
                                    .replace('__COMMAND__', '')
 
     assert wrappers_dir.join('run-in' + get_wrapper_extension()).read() == expected_run_in_content