Merge branch 'master' of github.com:kennethreitz/pipenv

# Conflicts:
#	pipenv/environments.py

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
This commit is contained in:
2017-09-22 12:23:53 -04:00
+5 -5
View File
@@ -9,7 +9,7 @@ os.environ.pop('__PYVENV_LAUNCHER__', None)
# Shell compatibility mode, for mis-configured shells.
PIPENV_SHELL_COMPAT = bool(os.environ.get('PIPENV_SHELL_COMPAT'))
# Create the virtualenv in the project, isntead of with pew.
# Create the virtualenv in the project, instead of with pew.
PIPENV_VENV_IN_PROJECT = bool(os.environ.get('PIPENV_VENV_IN_PROJECT'))
# No color mode, for unfun people.
@@ -24,10 +24,10 @@ PIPENV_PIPFILE = os.environ.get('PIPENV_PIPFILE')
# Tells Pipenv which Python to default to, when none is provided.
PIPENV_DEFAULT_PYTHON_VERSION = os.environ.get('PIPENV_DEFAULT_PYTHON_VERSION')
# Tells pipenv to not try to install -e dependencies to get their dependency information.
# Tells Pipenv to not try to install -e dependencies to get their dependency information.
PIPENV_DONT_EAT_EDITABLES = bool(os.environ.get('PIPENV_DONT_EAT_EDITABLES'))
# Tells pipenv to not load .env files.
# Tells Pipenv to not load .env files.
PIPENV_DONT_LOAD_ENV = bool(os.environ.get('PIPENV_DONT_LOAD_ENV'))
# Tell Pipenv to default to yes at all prompts.
@@ -46,7 +46,7 @@ if 'PIPENV_ACTIVE' not in os.environ:
# Tells Pipenv to use hashing mode.
PIPENV_USE_HASHES = True
# Tells pipenv to skip case-checking (slow internet connections).
# Tells Pipenv to skip case-checking (slow internet connections).
PIPENV_SKIP_VALIDATION = True
# Use shell compatibility mode when using venv in project mode.
@@ -65,7 +65,7 @@ PIPENV_HIDE_EMOJIS = bool(os.environ.get('PIPENV_HIDE_EMOJIS'))
if os.name == 'nt':
PIPENV_HIDE_EMOJIS = True
# Tells pipenv how long to wait for virtualenvs to be created in seconds
# Tells Pipenv how long to wait for virtualenvs to be created in seconds.
PIPENV_TIMEOUT = int(os.environ.get('PIPENV_TIMEOUT', 120))
PIPENV_INSTALL_TIMEOUT = 60 * 15