Skip to content

Commit 8fc25de

Browse files
authored
refactor(bzlmod): stop using 'repo' attr in whl_library (bazel-contrib#2779)
A simple non-functional cleanup that just removes legacy code paths from bzlmod PyPI integration.
1 parent 101962a commit 8fc25de

File tree

3 files changed

+4
-25
lines changed

3 files changed

+4
-25
lines changed

python/private/pypi/extension.bzl

-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ def _create_whl_repos(
181181
# Construct args separately so that the lock file can be smaller and does not include unused
182182
# attrs.
183183
whl_library_args = dict(
184-
repo = pip_name,
185184
dep_template = "@{}//{{name}}:{{target}}".format(hub_name),
186185
)
187186
maybe_args = dict(

python/private/pypi/whl_library.bzl

+4-2
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,10 @@ and the target that we need respectively.
517517
doc = "Name of the group, if any.",
518518
),
519519
"repo": attr.string(
520-
mandatory = True,
521-
doc = "Pointer to parent repo name. Used to make these rules rerun if the parent repo changes.",
520+
doc = """\
521+
Pointer to parent repo name. Used to make these rules rerun if the parent repo changes.
522+
Only used in WORKSPACE when the {attr}`dep_template` is not set.
523+
""",
522524
),
523525
"repo_prefix": attr.string(
524526
doc = """

tests/pypi/extension/extension_tests.bzl

-22
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ def _test_simple(env):
174174
"pypi_315_simple": {
175175
"dep_template": "@pypi//{name}:{target}",
176176
"python_interpreter_target": "unit_test_interpreter_target",
177-
"repo": "pypi_315",
178177
"requirement": "simple==0.0.1 --hash=sha256:deadbeef --hash=sha256:deadbaaf",
179178
},
180179
})
@@ -234,13 +233,11 @@ def _test_simple_multiple_requirements(env):
234233
"pypi_315_simple_osx_aarch64_osx_x86_64": {
235234
"dep_template": "@pypi//{name}:{target}",
236235
"python_interpreter_target": "unit_test_interpreter_target",
237-
"repo": "pypi_315",
238236
"requirement": "simple==0.0.2 --hash=sha256:deadb00f",
239237
},
240238
"pypi_315_simple_windows_x86_64": {
241239
"dep_template": "@pypi//{name}:{target}",
242240
"python_interpreter_target": "unit_test_interpreter_target",
243-
"repo": "pypi_315",
244241
"requirement": "simple==0.0.1 --hash=sha256:deadbeef",
245242
},
246243
})
@@ -307,13 +304,11 @@ torch==2.4.1 ; platform_machine != 'x86_64' \
307304
"pypi_315_torch_linux_aarch64_linux_arm_linux_ppc_linux_s390x_osx_aarch64": {
308305
"dep_template": "@pypi//{name}:{target}",
309306
"python_interpreter_target": "unit_test_interpreter_target",
310-
"repo": "pypi_315",
311307
"requirement": "torch==2.4.1 --hash=sha256:deadbeef",
312308
},
313309
"pypi_315_torch_linux_x86_64_osx_x86_64_windows_x86_64": {
314310
"dep_template": "@pypi//{name}:{target}",
315311
"python_interpreter_target": "unit_test_interpreter_target",
316-
"repo": "pypi_315",
317312
"requirement": "torch==2.4.1+cpu",
318313
},
319314
})
@@ -444,7 +439,6 @@ torch==2.4.1+cpu ; platform_machine == 'x86_64' \
444439
"experimental_target_platforms": ["cp312_linux_x86_64"],
445440
"filename": "torch-2.4.1+cpu-cp312-cp312-linux_x86_64.whl",
446441
"python_interpreter_target": "unit_test_interpreter_target",
447-
"repo": "pypi_312",
448442
"requirement": "torch==2.4.1+cpu",
449443
"sha256": "8800deef0026011d502c0c256cc4b67d002347f63c3a38cd8e45f1f445c61364",
450444
"urls": ["https://torch.index/whl/cpu/torch-2.4.1%2Bcpu-cp312-cp312-linux_x86_64.whl"],
@@ -454,7 +448,6 @@ torch==2.4.1+cpu ; platform_machine == 'x86_64' \
454448
"experimental_target_platforms": ["cp312_linux_aarch64"],
455449
"filename": "torch-2.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl",
456450
"python_interpreter_target": "unit_test_interpreter_target",
457-
"repo": "pypi_312",
458451
"requirement": "torch==2.4.1",
459452
"sha256": "36109432b10bd7163c9b30ce896f3c2cca1b86b9765f956a1594f0ff43091e2a",
460453
"urls": ["https://torch.index/whl/cpu/torch-2.4.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"],
@@ -464,7 +457,6 @@ torch==2.4.1+cpu ; platform_machine == 'x86_64' \
464457
"experimental_target_platforms": ["cp312_windows_x86_64"],
465458
"filename": "torch-2.4.1+cpu-cp312-cp312-win_amd64.whl",
466459
"python_interpreter_target": "unit_test_interpreter_target",
467-
"repo": "pypi_312",
468460
"requirement": "torch==2.4.1+cpu",
469461
"sha256": "3a570e5c553415cdbddfe679207327b3a3806b21c6adea14fba77684d1619e97",
470462
"urls": ["https://torch.index/whl/cpu/torch-2.4.1%2Bcpu-cp312-cp312-win_amd64.whl"],
@@ -474,7 +466,6 @@ torch==2.4.1+cpu ; platform_machine == 'x86_64' \
474466
"experimental_target_platforms": ["cp312_osx_aarch64"],
475467
"filename": "torch-2.4.1-cp312-none-macosx_11_0_arm64.whl",
476468
"python_interpreter_target": "unit_test_interpreter_target",
477-
"repo": "pypi_312",
478469
"requirement": "torch==2.4.1",
479470
"sha256": "72b484d5b6cec1a735bf3fa5a1c4883d01748698c5e9cfdbeb4ffab7c7987e0d",
480471
"urls": ["https://torch.index/whl/cpu/torch-2.4.1-cp312-none-macosx_11_0_arm64.whl"],
@@ -560,7 +551,6 @@ simple==0.0.3 \
560551
"experimental_target_platforms": ["cp315_linux_x86_64"],
561552
"extra_pip_args": ["--platform=manylinux_2_17_x86_64", "--python-version=315", "--implementation=cp", "--abi=cp315"],
562553
"python_interpreter_target": "unit_test_interpreter_target",
563-
"repo": "pypi_315",
564554
"requirement": "extra==0.0.1 --hash=sha256:deadb00f",
565555
},
566556
"pypi_315_simple_linux_x86_64": {
@@ -569,7 +559,6 @@ simple==0.0.3 \
569559
"experimental_target_platforms": ["cp315_linux_x86_64"],
570560
"extra_pip_args": ["--platform=manylinux_2_17_x86_64", "--python-version=315", "--implementation=cp", "--abi=cp315"],
571561
"python_interpreter_target": "unit_test_interpreter_target",
572-
"repo": "pypi_315",
573562
"requirement": "simple==0.0.1 --hash=sha256:deadbeef",
574563
},
575564
"pypi_315_simple_osx_aarch64": {
@@ -578,7 +567,6 @@ simple==0.0.3 \
578567
"experimental_target_platforms": ["cp315_osx_aarch64"],
579568
"extra_pip_args": ["--platform=macosx_10_9_arm64", "--python-version=315", "--implementation=cp", "--abi=cp315"],
580569
"python_interpreter_target": "unit_test_interpreter_target",
581-
"repo": "pypi_315",
582570
"requirement": "simple==0.0.3 --hash=sha256:deadbaaf",
583571
},
584572
})
@@ -766,7 +754,6 @@ git_dep @ git+https://git.server/repo/project@deadbeefdeadbeef
766754
"extra_pip_args": ["--extra-args-for-sdist-building"],
767755
"filename": "any-name.tar.gz",
768756
"python_interpreter_target": "unit_test_interpreter_target",
769-
"repo": "pypi_315",
770757
"requirement": "direct_sdist_without_sha @ some-archive/any-name.tar.gz",
771758
"sha256": "",
772759
"urls": ["some-archive/any-name.tar.gz"],
@@ -776,7 +763,6 @@ git_dep @ git+https://git.server/repo/project@deadbeefdeadbeef
776763
"experimental_target_platforms": ["cp315_linux_aarch64", "cp315_linux_arm", "cp315_linux_ppc", "cp315_linux_s390x", "cp315_linux_x86_64", "cp315_osx_aarch64", "cp315_osx_x86_64", "cp315_windows_x86_64"],
777764
"filename": "direct_without_sha-0.0.1-py3-none-any.whl",
778765
"python_interpreter_target": "unit_test_interpreter_target",
779-
"repo": "pypi_315",
780766
"requirement": "direct_without_sha==0.0.1 @ example-direct.org/direct_without_sha-0.0.1-py3-none-any.whl",
781767
"sha256": "",
782768
"urls": ["example-direct.org/direct_without_sha-0.0.1-py3-none-any.whl"],
@@ -785,22 +771,19 @@ git_dep @ git+https://git.server/repo/project@deadbeefdeadbeef
785771
"dep_template": "@pypi//{name}:{target}",
786772
"extra_pip_args": ["--extra-args-for-sdist-building"],
787773
"python_interpreter_target": "unit_test_interpreter_target",
788-
"repo": "pypi_315",
789774
"requirement": "git_dep @ git+https://git.server/repo/project@deadbeefdeadbeef",
790775
},
791776
"pypi_315_pip_fallback": {
792777
"dep_template": "@pypi//{name}:{target}",
793778
"extra_pip_args": ["--extra-args-for-sdist-building"],
794779
"python_interpreter_target": "unit_test_interpreter_target",
795-
"repo": "pypi_315",
796780
"requirement": "pip_fallback==0.0.1",
797781
},
798782
"pypi_315_simple_py3_none_any_deadb00f": {
799783
"dep_template": "@pypi//{name}:{target}",
800784
"experimental_target_platforms": ["cp315_linux_aarch64", "cp315_linux_arm", "cp315_linux_ppc", "cp315_linux_s390x", "cp315_linux_x86_64", "cp315_osx_aarch64", "cp315_osx_x86_64", "cp315_windows_x86_64"],
801785
"filename": "simple-0.0.1-py3-none-any.whl",
802786
"python_interpreter_target": "unit_test_interpreter_target",
803-
"repo": "pypi_315",
804787
"requirement": "simple==0.0.1",
805788
"sha256": "deadb00f",
806789
"urls": ["example2.org"],
@@ -811,7 +794,6 @@ git_dep @ git+https://git.server/repo/project@deadbeefdeadbeef
811794
"extra_pip_args": ["--extra-args-for-sdist-building"],
812795
"filename": "simple-0.0.1.tar.gz",
813796
"python_interpreter_target": "unit_test_interpreter_target",
814-
"repo": "pypi_315",
815797
"requirement": "simple==0.0.1",
816798
"sha256": "deadbeef",
817799
"urls": ["example.org"],
@@ -821,7 +803,6 @@ git_dep @ git+https://git.server/repo/project@deadbeefdeadbeef
821803
"experimental_target_platforms": ["cp315_linux_aarch64", "cp315_linux_arm", "cp315_linux_ppc", "cp315_linux_s390x", "cp315_linux_x86_64", "cp315_osx_aarch64", "cp315_osx_x86_64", "cp315_windows_x86_64"],
822804
"filename": "some_pkg-0.0.1-py3-none-any.whl",
823805
"python_interpreter_target": "unit_test_interpreter_target",
824-
"repo": "pypi_315",
825806
"requirement": "some_pkg==0.0.1 @ example-direct.org/some_pkg-0.0.1-py3-none-any.whl --hash=sha256:deadbaaf",
826807
"sha256": "deadbaaf",
827808
"urls": ["example-direct.org/some_pkg-0.0.1-py3-none-any.whl"],
@@ -831,7 +812,6 @@ git_dep @ git+https://git.server/repo/project@deadbeefdeadbeef
831812
"experimental_target_platforms": ["cp315_linux_aarch64", "cp315_linux_arm", "cp315_linux_ppc", "cp315_linux_s390x", "cp315_linux_x86_64", "cp315_osx_aarch64", "cp315_osx_x86_64", "cp315_windows_x86_64"],
832813
"filename": "some-other-pkg-0.0.1-py3-none-any.whl",
833814
"python_interpreter_target": "unit_test_interpreter_target",
834-
"repo": "pypi_315",
835815
"requirement": "some_other_pkg==0.0.1",
836816
"sha256": "deadb33f",
837817
"urls": ["example2.org/index/some_other_pkg/"],
@@ -920,13 +900,11 @@ optimum[onnxruntime-gpu]==1.17.1 ; sys_platform == 'linux'
920900
"pypi_315_optimum_linux_aarch64_linux_arm_linux_ppc_linux_s390x_linux_x86_64": {
921901
"dep_template": "@pypi//{name}:{target}",
922902
"python_interpreter_target": "unit_test_interpreter_target",
923-
"repo": "pypi_315",
924903
"requirement": "optimum[onnxruntime-gpu]==1.17.1",
925904
},
926905
"pypi_315_optimum_osx_aarch64_osx_x86_64": {
927906
"dep_template": "@pypi//{name}:{target}",
928907
"python_interpreter_target": "unit_test_interpreter_target",
929-
"repo": "pypi_315",
930908
"requirement": "optimum[onnxruntime]==1.17.1",
931909
},
932910
})

0 commit comments

Comments
 (0)