Merge branch 'fix-3005-update-pythonfinder' of github.com:pypa/pipenv into fix-3005-update-pythonfinder

This commit is contained in:
Dan Ryan
2018-10-13 02:51:11 -04:00
3 changed files with 20 additions and 7 deletions
+1 -1
View File
@@ -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(),
]
-6
View File
@@ -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()
+19
View File
@@ -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):