Update conda environment variable

Miserlou · Jan 7, 2017 · 03e8d95 · 03e8d95
1 parent fd85cca
commit 03e8d95
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/zappa/zappa.py b/zappa/zappa.py
@@ -334,10 +334,10 @@ def create_lambda_zip(self, prefix='lambda_package', handler_file=None,
             conda_mode = False
             if 'VIRTUAL_ENV' in os.environ:
                 venv = os.environ['VIRTUAL_ENV']
-            elif 'CONDA_ENV_PATH' in os.environ:
-                venv = os.environ['CONDA_ENV_PATH']
-                conda_env = venv
+            elif 'CONDA_PREFIX' in os.environ or 'CONDA_ENV_PATH' in os.environ:
                 conda_mode = True
+                venv = os.environ['CONDA_PREFIX'] if 'CONDA_PREFIX' in os.environ else os.environ['CONDA_ENV_PATH']
+                conda_env = venv
             elif os.path.exists('.python-version'):  # pragma: no cover
                 logger.debug("Pyenv's local virtualenv detected.")
                 try: