diff --git a/pipenv/core.py b/pipenv/core.py index c5891a57..3dd126bf 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -1847,7 +1847,7 @@ def do_install( # Install all dependencies, if none was provided. # This basically ensures that we have a pipfile and lockfile, then it locks and # installs from the lockfile - if packages is False and editable_packages is False: + if not packages and not editable_packages: # Update project settings with pre preference. if pre: project.update_settings({"allow_prereleases": pre}) @@ -1872,13 +1872,17 @@ def do_install( # make a tuple of (display_name, entry) pkg_list = packages + ["-e {0}".format(pkg) for pkg in editable_packages] if not system and not project.virtualenv_exists: - with create_spinner("Creating virtualenv...") as sp: - try: - do_create_virtualenv(pypi_mirror=pypi_mirror) - except KeyboardInterrupt: - cleanup_virtualenv(bare=(not environments.is_verbose())) - sys.exit(1) - sp.write_err("Ok...") + do_init( + dev=dev, + system=system, + allow_global=system, + concurrent=concurrent, + keep_outdated=keep_outdated, + requirements_dir=requirements_directory, + deploy=deploy, + pypi_mirror=pypi_mirror, + skip_lock=skip_lock, + ) for pkg_line in pkg_list: click.echo( crayons.normal( diff --git a/pipenv/environment.py b/pipenv/environment.py index 5e867374..db0e22aa 100644 --- a/pipenv/environment.py +++ b/pipenv/environment.py @@ -25,7 +25,7 @@ class Environment(object): super(Environment, self).__init__() self._modules = {'pkg_resources': pkg_resources, 'pipenv': pipenv} self.base_working_set = base_working_set if base_working_set else BASE_WORKING_SET - self.is_venv = not os.samefile(os.path.abspath(prefix), sys.prefix) + self.is_venv = not os.path.samefile(os.path.abspath(prefix), sys.prefix) if not sources: sources = [] self.sources = sources diff --git a/pipenv/vendor/requirementslib/exceptions.py b/pipenv/vendor/requirementslib/exceptions.py index 1a73f98e..23bc5e50 100644 --- a/pipenv/vendor/requirementslib/exceptions.py +++ b/pipenv/vendor/requirementslib/exceptions.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import +from __future__ import absolute_import, print_function import errno import os import six