somehow this change got reverted

pypa · Jul 11, 2023 · 49b7891 · 49b7891
1 parent 041695b
commit 49b7891
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 14 deletions.
diff --git a/tests/integration/test_install_basic.py b/tests/integration/test_install_basic.py
@@ -4,7 +4,6 @@
 from tempfile import TemporaryDirectory
 
 import pytest
-from .conftest import DEFAULT_PRIVATE_PYPI_SERVER
 
 from pipenv.utils.processes import subprocess_run
 from pipenv.utils.shell import temp_environ
@@ -440,7 +439,7 @@ def test_rewrite_outline_table(pipenv_instance_private_pypi):
 [packages.requests]
 version = "*"
 extras = ["socks"]
-            """.format(DEFAULT_PRIVATE_PYPI_SERVER, "{version = \"*\"}").strip()
+            """.format(p.index_url, "{version = \"*\"}").strip()
             f.write(contents)
         c = p.pipenv("install colorama")
         assert c.returncode == 0

diff --git a/tests/integration/test_install_markers.py b/tests/integration/test_install_markers.py
@@ -3,7 +3,6 @@
 import pytest
 from flaky import flaky
 
-from .conftest import DEFAULT_PRIVATE_PYPI_SERVER
 
 from pipenv.project import Project
 from pipenv.utils.shell import temp_environ
@@ -24,7 +23,7 @@ def test_package_environment_markers(pipenv_instance_private_pypi):
 fake_package = {}
 
 [dev-packages]
-            """.format(DEFAULT_PRIVATE_PYPI_SERVER, "{version = \"*\", markers=\"os_name=='splashwear'\", index=\"testindex\"}").strip()
+            """.format(p.index_url, "{version = \"*\", markers=\"os_name=='splashwear'\", index=\"testindex\"}").strip()
             f.write(contents)
 
         c = p.pipenv('install -v')

diff --git a/tests/integration/test_install_twists.py b/tests/integration/test_install_twists.py
@@ -3,7 +3,6 @@
 import sys
 
 import pytest
-from .conftest import DEFAULT_PRIVATE_PYPI_SERVER
 
 from pipenv.utils.shell import temp_environ
 
@@ -294,7 +293,7 @@ def test_install_skip_lock(pipenv_instance_private_pypi):
 
 [packages]
 six = {}
-            """.format(DEFAULT_PRIVATE_PYPI_SERVER, '{version = "*", index = "pypi"}').strip()
+            """.format(p.index_url, '{version = "*", index = "pypi"}').strip()
             f.write(contents)
         c = p.pipenv('install --skip-lock')
         assert c.returncode == 0

diff --git a/tests/integration/test_lock.py b/tests/integration/test_lock.py
@@ -3,7 +3,6 @@
 
 import pytest
 
-from .conftest import DEFAULT_PRIVATE_PYPI_SERVER
 
 from flaky import flaky
 from pipenv.utils.shell import temp_environ

diff --git a/tests/integration/test_sync.py b/tests/integration/test_sync.py
@@ -1,7 +1,5 @@
 import pytest
 
-from .conftest import DEFAULT_PRIVATE_PYPI_SERVER
-
 from pipenv.utils.shell import temp_environ
 
 
@@ -23,7 +21,7 @@ def test_sync_error_without_lockfile(pipenv_instance_pypi):
 @pytest.mark.lock
 def test_mirror_lock_sync(pipenv_instance_private_pypi):
     with temp_environ(), pipenv_instance_private_pypi() as p:
-        mirror_url = DEFAULT_PRIVATE_PYPI_SERVER
+        mirror_url = p.index_url
         assert 'pypi.org' not in mirror_url
         with open(p.pipfile_path, 'w') as f:
             f.write("""

diff --git a/tests/integration/test_uninstall.py b/tests/integration/test_uninstall.py
@@ -1,8 +1,5 @@
-import os
-
 import pytest
 
-from .conftest import DEFAULT_PRIVATE_PYPI_SERVER
 
 from pipenv.utils.shell import temp_environ
 
@@ -57,7 +54,7 @@ def test_uninstall_django(pipenv_instance_private_pypi):
 def test_mirror_uninstall(pipenv_instance_pypi):
     with temp_environ(), pipenv_instance_pypi() as p:
 
-        mirror_url = DEFAULT_PRIVATE_PYPI_SERVER
+        mirror_url = p.index_url
         assert "pypi.org" not in mirror_url
 
         c = p.pipenv(f"install Django --pypi-mirror {mirror_url}")