From 2de310d0845cdf6d85daeddac3b390ec9c11f5ea Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Sun, 17 Sep 2017 17:36:30 -0400 Subject: [PATCH] fix pedantic bug #568 Signed-off-by: Kenneth Reitz --- pipenv/environments.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pipenv/environments.py b/pipenv/environments.py index 98736e1a..47324444 100644 --- a/pipenv/environments.py +++ b/pipenv/environments.py @@ -23,7 +23,10 @@ PIPENV_NOSPIN = os.environ.get('PIPENV_NOSPIN') PIPENV_MAX_DEPTH = int(os.environ.get('PIPENV_MAX_DEPTH', '3')) + 1 # Tells Pipenv to use the virtualenv-provided pip instead. -PIPENV_USE_SYSTEM = os.environ.get('VIRTUAL_ENV') if 'PIPENV_IGNORE_VIRTUALENVS' not in os.environ else False +PIPENV_USE_SYSTEM = False +if 'PIPENV_ACTIVE' not in os.environ: + if 'PIPENV_IGNORE_VIRTUALENVS' not in os.environ: + PIPENV_USE_SYSTEM = os.environ.get('VIRTUAL_ENV') # Tells Pipenv to use hashing mode. PIPENV_USE_HASHES = True