Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hint “pipenv run” after creating the virtualenv #2312

Merged
merged 2 commits into from
Jun 14, 2018
Merged

Hint “pipenv run” after creating the virtualenv #2312

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcc4dc5
Hint "pipenv run" after creating the virtualenv
uranusjr Jun 6, 2018
3c2c295
Merge branch 'master' into pipenv-run-in-hint
techalchemy Jun 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 11 additions & 17 deletions pipenv/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,20 +1178,6 @@ def activate_virtualenv(source=True):
return '{0}/bin/activate'.format(venv_location)


def do_activate_virtualenv(bare=False):
"""Executes the activate virtualenv functionality."""
# Check for environment marker, and skip if it's set.
if 'PIPENV_ACTIVE' not in os.environ:
if not bare:
click.echo(
'To activate this project\'s virtualenv, run the following:\n $ {0}'.format(
crayons.red('pipenv shell')
)
)
else:
click.echo(activate_virtualenv())


def do_purge(bare=False, downloads=False, allow_global=False, verbose=False):
"""Executes the purge functionality."""
if downloads:
Expand Down Expand Up @@ -1355,9 +1341,17 @@ def do_init(
pypi_mirror=pypi_mirror,
)
requirements_dir.cleanup()
# Activate virtualenv instructions.
if not allow_global and not deploy:
do_activate_virtualenv()

# Hint the user what to do to activate the virtualenv.
if not allow_global and not deploy and 'PIPENV_ACTIVE' not in os.environ:
click.echo(
"To activate this project's virtualenv, run {0}.\n"
"Alternativaly, run a command "
"inside the virtualenv with {1}.".format(
crayons.red('pipenv shell'),
crayons.red('pipenv run'),
)
)


def pip_install(
Expand Down