Commit 01b01aa6 by Maxim Koltsov Committed by Steph Samson

Detect Conda when looking for a virtual env (#1432)

Currently Poetry will detect that it is running in a usual virtual env
created with "python -m venv" and will not create an additional env.

This commit extends this logic to Conda, which uses different
environment variables to indicate running in a virtual env.

Conda's "base" env is treated specially to avoid polluting global
namespace.
parent f7598762
...@@ -286,7 +286,13 @@ class EnvManager(object): ...@@ -286,7 +286,13 @@ class EnvManager(object):
python_minor = env["minor"] python_minor = env["minor"]
# Check if we are inside a virtualenv or not # Check if we are inside a virtualenv or not
in_venv = os.environ.get("VIRTUAL_ENV") is not None # Conda sets CONDA_PREFIX in its envs, see
# https://github.com/conda/conda/issues/2764
env_prefix = os.environ.get("VIRTUAL_ENV", os.environ.get("CONDA_PREFIX"))
conda_env_name = os.environ.get("CONDA_DEFAULT_ENV")
# It's probably not a good idea to pollute Conda's global "base" env, since
# most users have it activated all the time.
in_venv = env_prefix is not None and conda_env_name != "base"
if not in_venv or env is not None: if not in_venv or env is not None:
# Checking if a local virtualenv exists # Checking if a local virtualenv exists
...@@ -315,8 +321,8 @@ class EnvManager(object): ...@@ -315,8 +321,8 @@ class EnvManager(object):
return VirtualEnv(venv) return VirtualEnv(venv)
if os.environ.get("VIRTUAL_ENV") is not None: if env_prefix is not None:
prefix = Path(os.environ["VIRTUAL_ENV"]) prefix = Path(env_prefix)
base_prefix = None base_prefix = None
else: else:
prefix = Path(sys.prefix) prefix = Path(sys.prefix)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment