diff --git a/pipenv/core.py b/pipenv/core.py index 37afdc59..04226e0e 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -875,7 +875,7 @@ def do_create_virtualenv(python=None, site_packages=False, pypi_mirror=None): sys.executable, "-m", "virtualenv", - "--prompt=({0})".format(project.name), + "--prompt=({0}) ".format(project.name), "--python={0}".format(python), project.get_location_for_virtualenv(), ] diff --git a/pipenv/project.py b/pipenv/project.py index 3a4d3cce..a3e31bfd 100644 --- a/pipenv/project.py +++ b/pipenv/project.py @@ -479,12 +479,6 @@ class Project(object): return contents - @property - def pased_pure_pipfile(self): - contents = self.read_pipfile() - - return self._parse_pipfile(contents) - def clear_pipfile_cache(self): """Clear pipfile cache (e.g., so we can mutate parsed pipfile)""" _pipfile_cache.clear() diff --git a/tests/integration/test_lock.py b/tests/integration/test_lock.py index 23d75f8e..ac296476 100644 --- a/tests/integration/test_lock.py +++ b/tests/integration/test_lock.py @@ -368,6 +368,25 @@ requests = {git = "https://github.com/requests/requests.git", editable = true, e assert c.return_code == 0 +@pytest.mark.lock +@pytest.mark.vcs +@pytest.mark.needs_internet +def test_lock_editable_vcs_with_markers_without_install(PipenvInstance, pypi): + with PipenvInstance(pypi=pypi, chdir=True) as p: + with open(p.pipfile_path, 'w') as f: + f.write(""" +[packages] +requests = {git = "https://github.com/requests/requests.git", ref = "master", editable = true, markers = "python_version >= '2.6'"} + """.strip()) + c = p.pipenv('lock') + assert c.return_code == 0 + assert 'requests' in p.lockfile['default'] + assert 'idna' in p.lockfile['default'] + assert 'chardet' in p.lockfile['default'] + c = p.pipenv('install') + assert c.return_code == 0 + + @pytest.mark.lock @pytest.mark.skip(reason="This doesn't work for some reason.") def test_lock_respecting_python_version(PipenvInstance, pypi):