Skip to content

Commit 2feaca9

Browse files
authored
Fix wheel name normalization in tests (#13246)
Setuptools v75.8.1 normalizes the filenames of the wheels it produces in compliance with a "recent" change in the wheel specification. This also applies to the .dist-info directories.
1 parent 5a43d67 commit 2feaca9

File tree

4 files changed

+33
-33
lines changed

4 files changed

+33
-33
lines changed

tests/functional/test_install.py

+18-18
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ def test_pip_second_command_line_interface_works(
291291
args.extend(["install", "INITools==0.2"])
292292
args.extend(["-f", os.fspath(data.packages)])
293293
result = script.run(*args)
294-
dist_info_folder = script.site_packages / "INITools-0.2.dist-info"
294+
dist_info_folder = script.site_packages / "initools-0.2.dist-info"
295295
initools_folder = script.site_packages / "initools"
296296
result.did_create(dist_info_folder)
297297
result.did_create(initools_folder)
@@ -363,7 +363,7 @@ def test_basic_install_from_pypi(script: PipTestEnvironment) -> None:
363363
Test installing a package from PyPI.
364364
"""
365365
result = script.pip("install", "INITools==0.2")
366-
dist_info_folder = script.site_packages / "INITools-0.2.dist-info"
366+
dist_info_folder = script.site_packages / "initools-0.2.dist-info"
367367
initools_folder = script.site_packages / "initools"
368368
result.did_create(dist_info_folder)
369369
result.did_create(initools_folder)
@@ -555,7 +555,7 @@ def test_basic_install_from_local_directory(
555555
args.append(os.fspath(to_install))
556556
result = script.pip(*args)
557557
fspkg_folder = script.site_packages / "fspkg"
558-
dist_info_folder = script.site_packages / "FSPkg-0.1.dev0.dist-info"
558+
dist_info_folder = script.site_packages / "fspkg-0.1.dev0.dist-info"
559559
result.did_create(fspkg_folder)
560560
result.did_create(dist_info_folder)
561561

@@ -577,7 +577,7 @@ def test_basic_install_relative_directory(
577577
"""
578578
Test installing a requirement using a relative path.
579579
"""
580-
dist_info_folder = script.site_packages / "FSPkg-0.1.dev0.dist-info"
580+
dist_info_folder = script.site_packages / "fspkg-0.1.dev0.dist-info"
581581
egg_link_file = script.site_packages / "FSPkg.egg-link"
582582
package_folder = script.site_packages / "fspkg"
583583

@@ -871,7 +871,7 @@ def test_install_from_local_directory_with_in_tree_build(
871871
assert not in_tree_build_dir.exists()
872872
result = script.pip("install", to_install)
873873
fspkg_folder = script.site_packages / "fspkg"
874-
dist_info_folder = script.site_packages / "FSPkg-0.1.dev0.dist-info"
874+
dist_info_folder = script.site_packages / "fspkg-0.1.dev0.dist-info"
875875
result.did_create(fspkg_folder)
876876
result.did_create(dist_info_folder)
877877
assert in_tree_build_dir.exists()
@@ -1025,7 +1025,7 @@ def test_install_curdir(script: PipTestEnvironment, data: TestData) -> None:
10251025
rmtree(egg_info)
10261026
result = script.pip("install", curdir, cwd=run_from)
10271027
fspkg_folder = script.site_packages / "fspkg"
1028-
dist_info_folder = script.site_packages / "FSPkg-0.1.dev0.dist-info"
1028+
dist_info_folder = script.site_packages / "fspkg-0.1.dev0.dist-info"
10291029
result.did_create(fspkg_folder)
10301030
result.did_create(dist_info_folder)
10311031

@@ -1037,7 +1037,7 @@ def test_install_pardir(script: PipTestEnvironment, data: TestData) -> None:
10371037
run_from = data.packages.joinpath("FSPkg", "fspkg")
10381038
result = script.pip("install", pardir, cwd=run_from)
10391039
fspkg_folder = script.site_packages / "fspkg"
1040-
dist_info_folder = script.site_packages / "FSPkg-0.1.dev0.dist-info"
1040+
dist_info_folder = script.site_packages / "fspkg-0.1.dev0.dist-info"
10411041
result.did_create(fspkg_folder)
10421042
result.did_create(dist_info_folder)
10431043

@@ -1550,9 +1550,9 @@ def test_url_req_case_mismatch_no_index(
15501550
)
15511551

15521552
# only Upper-1.0.tar.gz should get installed.
1553-
dist_info_folder = script.site_packages / "Upper-1.0.dist-info"
1553+
dist_info_folder = script.site_packages / "upper-1.0.dist-info"
15541554
result.did_create(dist_info_folder)
1555-
dist_info_folder = script.site_packages / "Upper-2.0.dist-info"
1555+
dist_info_folder = script.site_packages / "upper-2.0.dist-info"
15561556
result.did_not_create(dist_info_folder)
15571557

15581558

@@ -1578,10 +1578,10 @@ def test_url_req_case_mismatch_file_index(
15781578
"install", "--index-url", data.find_links3, Dinner, "requiredinner"
15791579
)
15801580

1581-
# only Upper-1.0.tar.gz should get installed.
1582-
dist_info_folder = script.site_packages / "Dinner-1.0.dist-info"
1581+
# only Dinner-1.0.tar.gz should get installed.
1582+
dist_info_folder = script.site_packages / "dinner-1.0.dist-info"
15831583
result.did_create(dist_info_folder)
1584-
dist_info_folder = script.site_packages / "Dinner-2.0.dist-info"
1584+
dist_info_folder = script.site_packages / "dinner-2.0.dist-info"
15851585
result.did_not_create(dist_info_folder)
15861586

15871587

@@ -1602,9 +1602,9 @@ def test_url_incorrect_case_no_index(
16021602
)
16031603

16041604
# only Upper-2.0.tar.gz should get installed.
1605-
dist_info_folder = script.site_packages / "Upper-1.0.dist-info"
1605+
dist_info_folder = script.site_packages / "upper-1.0.dist-info"
16061606
result.did_not_create(dist_info_folder)
1607-
dist_info_folder = script.site_packages / "Upper-2.0.dist-info"
1607+
dist_info_folder = script.site_packages / "upper-2.0.dist-info"
16081608
result.did_create(dist_info_folder)
16091609

16101610

@@ -1624,10 +1624,10 @@ def test_url_incorrect_case_file_index(
16241624
expect_stderr=True,
16251625
)
16261626

1627-
# only Upper-2.0.tar.gz should get installed.
1628-
dist_info_folder = script.site_packages / "Dinner-1.0.dist-info"
1627+
# only Dinner-2.0.tar.gz should get installed.
1628+
dist_info_folder = script.site_packages / "dinner-1.0.dist-info"
16291629
result.did_not_create(dist_info_folder)
1630-
dist_info_folder = script.site_packages / "Dinner-2.0.dist-info"
1630+
dist_info_folder = script.site_packages / "dinner-2.0.dist-info"
16311631
result.did_create(dist_info_folder)
16321632

16331633
# Should show index-url location in output
@@ -1798,7 +1798,7 @@ def test_install_builds_wheels(script: PipTestEnvironment, data: TestData) -> No
17981798
# into the cache
17991799
assert wheels != [], str(res)
18001800
assert wheels == [
1801-
f"Upper-2.0-py{sys.version_info[0]}-none-any.whl",
1801+
f"upper-2.0-py{sys.version_info[0]}-none-any.whl",
18021802
]
18031803

18041804

tests/functional/test_install_reqs.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def test_requirements_file(script: PipTestEnvironment) -> None:
8686
)
8787
)
8888
result = script.pip("install", "-r", script.scratch_path / "initools-req.txt")
89-
result.did_create(script.site_packages / "INITools-0.2.dist-info")
89+
result.did_create(script.site_packages / "initools-0.2.dist-info")
9090
result.did_create(script.site_packages / "initools")
9191
assert result.files_created[script.site_packages / other_lib_name].dir
9292
fn = f"{other_lib_name}-{other_lib_version}.dist-info"
@@ -130,7 +130,7 @@ def test_dependency_group(
130130
path = path(pyproject)
131131
arg = f"{path}:{groupname}"
132132
result = script.pip("install", "--group", arg)
133-
result.did_create(script.site_packages / "INITools-0.2.dist-info")
133+
result.did_create(script.site_packages / "initools-0.2.dist-info")
134134
result.did_create(script.site_packages / "initools")
135135
assert result.files_created[script.site_packages / "peppercorn"].dir
136136
assert result.files_created[script.site_packages / "peppercorn-0.6.dist-info"].dir
@@ -153,7 +153,7 @@ def test_multiple_dependency_groups(script: PipTestEnvironment) -> None:
153153
)
154154
)
155155
result = script.pip("install", "--group", "initools", "--group", "peppercorn")
156-
result.did_create(script.site_packages / "INITools-0.2.dist-info")
156+
result.did_create(script.site_packages / "initools-0.2.dist-info")
157157
result.did_create(script.site_packages / "initools")
158158
assert result.files_created[script.site_packages / "peppercorn"].dir
159159
assert result.files_created[script.site_packages / "peppercorn-0.6.dist-info"].dir
@@ -176,7 +176,7 @@ def test_dependency_group_with_non_normalized_name(script: PipTestEnvironment) -
176176
)
177177
)
178178
result = script.pip("install", "--group", "IniTools")
179-
result.did_create(script.site_packages / "INITools-0.2.dist-info")
179+
result.did_create(script.site_packages / "initools-0.2.dist-info")
180180
result.did_create(script.site_packages / "initools")
181181

182182

@@ -215,7 +215,7 @@ def test_relative_requirements_file(
215215
URLs, use an egg= definition.
216216
217217
"""
218-
dist_info_folder = script.site_packages / "FSPkg-0.1.dev0.dist-info"
218+
dist_info_folder = script.site_packages / "fspkg-0.1.dev0.dist-info"
219219
egg_link_file = script.site_packages / "FSPkg.egg-link"
220220
package_folder = script.site_packages / "fspkg"
221221

tests/functional/test_install_upgrade.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ def test_upgrade_to_specific_version(script: PipTestEnvironment) -> None:
144144
script.pip("install", "INITools==0.1")
145145
result = script.pip("install", "INITools==0.2")
146146
assert result.files_created, "pip install with specific version did not upgrade"
147-
assert script.site_packages / "INITools-0.1.dist-info" in result.files_deleted
148-
result.did_create(script.site_packages / "INITools-0.2.dist-info")
147+
assert script.site_packages / "initools-0.1.dist-info" in result.files_deleted
148+
result.did_create(script.site_packages / "initools-0.2.dist-info")
149149

150150

151151
@pytest.mark.network
@@ -157,7 +157,7 @@ def test_upgrade_if_requested(script: PipTestEnvironment) -> None:
157157
script.pip("install", "INITools==0.1")
158158
result = script.pip("install", "--upgrade", "INITools")
159159
assert result.files_created, "pip install --upgrade did not upgrade"
160-
result.did_not_create(script.site_packages / "INITools-0.1.dist-info")
160+
result.did_not_create(script.site_packages / "initools-0.1.dist-info")
161161

162162

163163
def test_upgrade_with_newest_already_installed(
@@ -319,8 +319,8 @@ def test_should_not_install_always_from_cache(script: PipTestEnvironment) -> Non
319319
script.pip("install", "INITools==0.2")
320320
script.pip("uninstall", "-y", "INITools")
321321
result = script.pip("install", "INITools==0.1")
322-
result.did_not_create(script.site_packages / "INITools-0.2.dist-info")
323-
result.did_create(script.site_packages / "INITools-0.1.dist-info")
322+
result.did_not_create(script.site_packages / "initools-0.2.dist-info")
323+
result.did_create(script.site_packages / "initools-0.1.dist-info")
324324

325325

326326
@pytest.mark.network
@@ -332,8 +332,8 @@ def test_install_with_ignoreinstalled_requested(script: PipTestEnvironment) -> N
332332
result = script.pip("install", "-I", "INITools==0.3")
333333
assert result.files_created, "pip install -I did not install"
334334
# both the old and new metadata should be present.
335-
assert os.path.exists(script.site_packages_path / "INITools-0.1.dist-info")
336-
assert os.path.exists(script.site_packages_path / "INITools-0.3.dist-info")
335+
assert os.path.exists(script.site_packages_path / "initools-0.1.dist-info")
336+
assert os.path.exists(script.site_packages_path / "initools-0.3.dist-info")
337337

338338

339339
@pytest.mark.network

tests/functional/test_install_user.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def test_reset_env_system_site_packages_usersite(
5353
"('initools').project_name)",
5454
)
5555
project_name = result.stdout.strip()
56-
assert "INITools" == project_name, project_name
56+
assert "initools" == project_name, project_name
5757

5858
@pytest.mark.xfail
5959
@pytest.mark.network
@@ -95,7 +95,7 @@ def test_install_from_current_directory_into_usersite(
9595
fspkg_folder = script.user_site / "fspkg"
9696
result.did_create(fspkg_folder)
9797

98-
dist_info_folder = script.user_site / "FSPkg-0.1.dev0.dist-info"
98+
dist_info_folder = script.user_site / "fspkg-0.1.dev0.dist-info"
9999
result.did_create(dist_info_folder)
100100

101101
def test_install_user_venv_nositepkgs_fails(
@@ -133,7 +133,7 @@ def test_install_user_conflict_in_usersite(
133133
result2 = script.pip("install", "--user", "INITools==0.1", "--no-binary=:all:")
134134

135135
# usersite has 0.1
136-
dist_info_folder = script.user_site / "INITools-0.1.dist-info"
136+
dist_info_folder = script.user_site / "initools-0.1.dist-info"
137137
initools_v3_file = (
138138
# file only in 0.3
139139
script.base_path

0 commit comments

Comments
 (0)