Skip to content

Commit 49b7891

Browse files
matteiusoz123
authored andcommitted
somehow this change got reverted
1 parent 041695b commit 49b7891

File tree

6 files changed

+5
-14
lines changed

6 files changed

+5
-14
lines changed

tests/integration/test_install_basic.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from tempfile import TemporaryDirectory
55

66
import pytest
7-
from .conftest import DEFAULT_PRIVATE_PYPI_SERVER
87

98
from pipenv.utils.processes import subprocess_run
109
from pipenv.utils.shell import temp_environ
@@ -440,7 +439,7 @@ def test_rewrite_outline_table(pipenv_instance_private_pypi):
440439
[packages.requests]
441440
version = "*"
442441
extras = ["socks"]
443-
""".format(DEFAULT_PRIVATE_PYPI_SERVER, "{version = \"*\"}").strip()
442+
""".format(p.index_url, "{version = \"*\"}").strip()
444443
f.write(contents)
445444
c = p.pipenv("install colorama")
446445
assert c.returncode == 0

tests/integration/test_install_markers.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import pytest
44
from flaky import flaky
55

6-
from .conftest import DEFAULT_PRIVATE_PYPI_SERVER
76

87
from pipenv.project import Project
98
from pipenv.utils.shell import temp_environ
@@ -24,7 +23,7 @@ def test_package_environment_markers(pipenv_instance_private_pypi):
2423
fake_package = {}
2524
2625
[dev-packages]
27-
""".format(DEFAULT_PRIVATE_PYPI_SERVER, "{version = \"*\", markers=\"os_name=='splashwear'\", index=\"testindex\"}").strip()
26+
""".format(p.index_url, "{version = \"*\", markers=\"os_name=='splashwear'\", index=\"testindex\"}").strip()
2827
f.write(contents)
2928

3029
c = p.pipenv('install -v')

tests/integration/test_install_twists.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import sys
44

55
import pytest
6-
from .conftest import DEFAULT_PRIVATE_PYPI_SERVER
76

87
from pipenv.utils.shell import temp_environ
98

@@ -294,7 +293,7 @@ def test_install_skip_lock(pipenv_instance_private_pypi):
294293
295294
[packages]
296295
six = {}
297-
""".format(DEFAULT_PRIVATE_PYPI_SERVER, '{version = "*", index = "pypi"}').strip()
296+
""".format(p.index_url, '{version = "*", index = "pypi"}').strip()
298297
f.write(contents)
299298
c = p.pipenv('install --skip-lock')
300299
assert c.returncode == 0

tests/integration/test_lock.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
import pytest
55

6-
from .conftest import DEFAULT_PRIVATE_PYPI_SERVER
76

87
from flaky import flaky
98
from pipenv.utils.shell import temp_environ

tests/integration/test_sync.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import pytest
22

3-
from .conftest import DEFAULT_PRIVATE_PYPI_SERVER
4-
53
from pipenv.utils.shell import temp_environ
64

75

@@ -23,7 +21,7 @@ def test_sync_error_without_lockfile(pipenv_instance_pypi):
2321
@pytest.mark.lock
2422
def test_mirror_lock_sync(pipenv_instance_private_pypi):
2523
with temp_environ(), pipenv_instance_private_pypi() as p:
26-
mirror_url = DEFAULT_PRIVATE_PYPI_SERVER
24+
mirror_url = p.index_url
2725
assert 'pypi.org' not in mirror_url
2826
with open(p.pipfile_path, 'w') as f:
2927
f.write("""

tests/integration/test_uninstall.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
import os
2-
31
import pytest
42

5-
from .conftest import DEFAULT_PRIVATE_PYPI_SERVER
63

74
from pipenv.utils.shell import temp_environ
85

@@ -57,7 +54,7 @@ def test_uninstall_django(pipenv_instance_private_pypi):
5754
def test_mirror_uninstall(pipenv_instance_pypi):
5855
with temp_environ(), pipenv_instance_pypi() as p:
5956

60-
mirror_url = DEFAULT_PRIVATE_PYPI_SERVER
57+
mirror_url = p.index_url
6158
assert "pypi.org" not in mirror_url
6259

6360
c = p.pipenv(f"install Django --pypi-mirror {mirror_url}")

0 commit comments

Comments
 (0)