Skip to content

Commit 4ab4865

Browse files
committed
One more rewrite to avoid distutils
1 parent 4bf1b67 commit 4ab4865

File tree

1 file changed

+32
-12
lines changed

1 file changed

+32
-12
lines changed

tests/functional/test_uninstall_user.py

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import pytest
77

88
from tests.functional.test_install_user import _patch_dist_in_site_packages
9-
from tests.lib import pyversion # noqa: F401
109
from tests.lib import PipTestEnvironment, TestData, assert_all_changes
1110
from tests.lib.venv import VirtualEnvironment
11+
from tests.lib.wheel import make_wheel
1212

1313

1414
@pytest.mark.incompatible_with_test_venv
@@ -28,14 +28,39 @@ def test_uninstall_from_usersite_with_dist_in_global_site(
2828
"""
2929
Test uninstall from usersite (with same dist in global site)
3030
"""
31+
entry_points_txt = "[console_scripts]\nscript = pkg:func"
32+
make_wheel(
33+
"pkg",
34+
"0.1",
35+
extra_metadata_files={"entry_points.txt": entry_points_txt},
36+
).save_to_dir(script.scratch_path)
37+
make_wheel(
38+
"pkg",
39+
"0.1.1",
40+
extra_metadata_files={"entry_points.txt": entry_points_txt},
41+
).save_to_dir(script.scratch_path)
42+
3143
_patch_dist_in_site_packages(virtualenv)
3244

33-
script.pip_install_local("pip-test-package==0.1", "--no-binary=:all:")
45+
script.pip(
46+
"install",
47+
"--no-index",
48+
"--find-links",
49+
script.scratch_path,
50+
"--no-warn-script-location",
51+
"pkg==0.1",
52+
)
3453

35-
result2 = script.pip_install_local(
36-
"--user", "pip-test-package==0.1.1", "--no-binary=:all:"
54+
result2 = script.pip(
55+
"install",
56+
"--no-index",
57+
"--find-links",
58+
script.scratch_path,
59+
"--no-warn-script-location",
60+
"--user",
61+
"pkg==0.1.1",
3762
)
38-
result3 = script.pip("uninstall", "-vy", "pip-test-package")
63+
result3 = script.pip("uninstall", "-vy", "pkg")
3964

4065
# uninstall console is mentioning user scripts, but not global scripts
4166
assert normcase(script.user_bin_path) in result3.stdout, str(result3)
@@ -45,13 +70,8 @@ def test_uninstall_from_usersite_with_dist_in_global_site(
4570
assert_all_changes(result2, result3, [script.venv / "build", "cache"])
4671

4772
# site still has 0.2 (can't look in result1; have to check)
48-
# keep checking for egg-info because no-binary implies setup.py install
49-
egg_info_folder = (
50-
script.base_path
51-
/ script.site_packages
52-
/ f"pip_test_package-0.1-py{pyversion}.egg-info"
53-
)
54-
assert isdir(egg_info_folder)
73+
dist_info_folder = script.base_path / script.site_packages / "pkg-0.1.dist-info"
74+
assert isdir(dist_info_folder)
5575

5676
def test_uninstall_editable_from_usersite(
5777
self, script: PipTestEnvironment, data: TestData

0 commit comments

Comments
 (0)