Merge pull request #2111 from greysteil/always-use-pipfile-for-sources

Always use sources from Pipfile when doing resolution

pipenv/resolver.py

@@ -68,7 +68,7 @@ def main():
     results = resolve(
         packages,
         pre=do_pre,
-        sources=project.sources,
+        sources=project.pipfile_sources,
         verbose=is_verbose,
         clear=do_clear,
         system=system,

tests/integration/test_lock.py

@@ -1,4 +1,5 @@
 import pytest
+import os
 
 from flaky import flaky
 
@@ -247,3 +248,41 @@ requests = "*"
         assert c.return_code == 0
         assert '-i https://pypi.python.org/simple' in c.out.strip()
         assert '--extra-index-url https://test.pypi.org/simple' in c.out.strip()
+
+
+@pytest.mark.install
+@pytest.mark.index
+def test_lock_updated_source(PipenvInstance, pypi):
+
+    with PipenvInstance(pypi=pypi) as p:
+        with open(p.pipfile_path, 'w') as f:
+            contents = """
+[[source]]
+url = "{url}/${{MY_ENV_VAR}}"
+
+[packages]
+requests = "==2.14.0"
+            """.strip().format(url=pypi.url)
+            f.write(contents)
+
+        os.environ['MY_ENV_VAR'] = 'simple'
+        c = p.pipenv('lock')
+        assert c.return_code == 0
+        assert 'requests' in p.lockfile['default']
+
+        del os.environ['MY_ENV_VAR']
+
+        with open(p.pipfile_path, 'w') as f:
+            contents = """
+[[source]]
+url = "{url}/simple"
+
+[packages]
+requests = "==2.14.0"
+            """.strip().format(url=pypi.url)
+            f.write(contents)
+
+        c = p.pipenv('lock')
+        assert c.return_code == 0
+        assert 'requests' in p.lockfile['default']
+