Merge branch 'master' into patch-1

pipenv/project.py

@@ -790,7 +790,7 @@ class Project(object):
         except Exception:
             document = tomlkit.document()
             for section in ("packages", "dev-packages"):
-                document[section] = tomlkit.container.Table()
+                document[section] = tomlkit.table()
                 # Convert things to inline tables — fancy :)
                 for package in data.get(section, {}):
                     if hasattr(data[section][package], "keys"):

tests/integration/test_install_basic.py

@@ -280,14 +280,13 @@ def test_bad_packages(PipenvInstance):
 @pytest.mark.extras
 @pytest.mark.install
 @pytest.mark.requirements
-@pytest.mark.skip(reason="Not mocking this.")
-def test_requirements_to_pipfile(PipenvInstance):
+def test_requirements_to_pipfile(PipenvInstance, pypi):
 
     with PipenvInstance(pipfile=False, chdir=True) as p:
 
         # Write a requirements file
         with open("requirements.txt", "w") as f:
-            f.write("requests[socks]==2.18.1\n")
+            f.write("-i {}\nrequests[socks]==2.19.1\n".format(pypi.url))
 
         c = p.pipenv("install")
         assert c.return_code == 0