Skip to content

Commit 75c9250

Browse files
committed
Merge branch 'main' into uv-lock-rule-instead-of-genrule
2 parents db046aa + bfa59b9 commit 75c9250

File tree

16 files changed

+84
-263
lines changed

16 files changed

+84
-263
lines changed

.bazelci/presubmit.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,10 @@ buildifier:
7878
coverage_targets:
7979
- //tests:my_lib_3_10_test
8080
- //tests:my_lib_3_11_test
81-
- //tests:my_lib_3_8_test
8281
- //tests:my_lib_3_9_test
8382
- //tests:my_lib_default_test
8483
- //tests:version_3_10_test
8584
- //tests:version_3_11_test
86-
- //tests:version_3_8_test
8785
- //tests:version_3_9_test
8886
- //tests:version_default_test
8987
tasks:

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,17 @@ Unreleased changes template.
6363
* 3.11.11
6464
* 3.12.9
6565
* 3.13.2
66+
* (pypi) Use `xcrun xcodebuild --showsdks` to find XCode root.
67+
* (toolchains) Remove all but `3.8.20` versions of the Python `3.8` interpreter who has
68+
reached EOL. If users still need other versions of the `3.8` interpreter, please supply
69+
the URLs manually {bzl:ob}`python.toolchain` or {bzl:obj}`python_register_toolchains` calls.
6670

6771
[20250317]: https://github.com/astral-sh/python-build-standalone/releases/tag/20250317
6872

6973
{#v0-0-0-fixed}
7074
### Fixed
7175
* (runfiles) ({obj}`--bootstrap_impl=script`) Follow symlinks when searching for runfiles.
72-
* Do not try to run `chmod` when downloading non-windows hermetic toolchain
76+
* (toolchains) Do not try to run `chmod` when downloading non-windows hermetic toolchain
7377
repositories on Windows. Fixes
7478
[#2660](https://github.com/bazel-contrib/rules_python/issues/2660).
7579

docs/requirements.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ astroid==3.3.6 \
1414
--hash=sha256:6aaea045f938c735ead292204afdb977a36e989522b7833ef6fea94de743f442 \
1515
--hash=sha256:db676dc4f3ae6bfe31cda227dc60e03438378d7a896aec57422c95634e8d722f
1616
# via sphinx-autodoc2
17-
babel==2.16.0 \
18-
--hash=sha256:368b5b98b37c06b7daf6696391c3240c938b37767d4584413e8438c5c435fa8b \
19-
--hash=sha256:d1f3554ca26605fe173f3de0c65f750f5a42f924499bf134de6423582298e316
17+
babel==2.17.0 \
18+
--hash=sha256:0c54cffb19f690cdcc52a3b50bcbf71e07a808d1c80d549f2459b9d2cf0afb9d \
19+
--hash=sha256:4d0b53093fdfb4b21c92b5213dba5a1b23885afa8383709427046b21c366e5f2
2020
# via sphinx
2121
certifi==2024.8.30 \
2222
--hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
@@ -370,7 +370,7 @@ typing-extensions==4.12.2 \
370370
# via
371371
# rules-python-docs (docs/pyproject.toml)
372372
# sphinx-autodoc2
373-
urllib3==2.2.3 \
374-
--hash=sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac \
375-
--hash=sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9
373+
urllib3==2.3.0 \
374+
--hash=sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df \
375+
--hash=sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d
376376
# via requests

examples/bzlmod_build_file_generation/requirements_lock.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ dill==0.3.6 \
2626
--hash=sha256:a07ffd2351b8c678dfc4a856a3005f8067aea51d6ba6c700796a4d9e280f39f0 \
2727
--hash=sha256:e5db55f3687856d8fbdab002ed78544e1c4559a130302693d839dfe8f93f2373
2828
# via pylint
29-
django==4.2.17 \
30-
--hash=sha256:3a93350214ba25f178d4045c0786c61573e7dbfa3c509b3551374f1e11ba8de0 \
31-
--hash=sha256:6b56d834cc94c8b21a8f4e775064896be3b4a4ca387f2612d4406a5927cd2fdc
29+
django==4.2.20 \
30+
--hash=sha256:213381b6e4405f5c8703fffc29cd719efdf189dec60c67c04f76272b3dc845b9 \
31+
--hash=sha256:92bac5b4432a64532abb73b2ac27203f485e40225d2640a7fbef2b62b876e789
3232
# via
3333
# -r requirements.in
3434
# django-stubs

examples/bzlmod_build_file_generation/requirements_windows.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ dill==0.3.6 \
3030
--hash=sha256:a07ffd2351b8c678dfc4a856a3005f8067aea51d6ba6c700796a4d9e280f39f0 \
3131
--hash=sha256:e5db55f3687856d8fbdab002ed78544e1c4559a130302693d839dfe8f93f2373
3232
# via pylint
33-
django==4.2.17 \
34-
--hash=sha256:3a93350214ba25f178d4045c0786c61573e7dbfa3c509b3551374f1e11ba8de0 \
35-
--hash=sha256:6b56d834cc94c8b21a8f4e775064896be3b4a4ca387f2612d4406a5927cd2fdc
33+
django==4.2.20 \
34+
--hash=sha256:213381b6e4405f5c8703fffc29cd719efdf189dec60c67c04f76272b3dc845b9 \
35+
--hash=sha256:92bac5b4432a64532abb73b2ac27203f485e40225d2640a7fbef2b62b876e789
3636
# via
3737
# -r requirements.in
3838
# django-stubs

examples/multi_python_versions/MODULE.bazel

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ local_path_override(
1010
)
1111

1212
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
13-
python.toolchain(
14-
configure_coverage_tool = True,
15-
python_version = "3.8",
16-
)
1713
python.toolchain(
1814
configure_coverage_tool = True,
1915
# Only set when you have mulitple toolchain versions.
@@ -36,11 +32,6 @@ use_repo(
3632

3733
pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
3834
use_repo(pip, "pypi")
39-
pip.parse(
40-
hub_name = "pypi",
41-
python_version = "3.8",
42-
requirements_lock = "//requirements:requirements_lock_3_8.txt",
43-
)
4435
pip.parse(
4536
hub_name = "pypi",
4637
python_version = "3.9",

examples/multi_python_versions/WORKSPACE

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ python_register_multi_toolchains(
1515
name = "python",
1616
default_version = default_python_version,
1717
python_versions = [
18-
"3.8",
1918
"3.9",
2019
"3.10",
2120
"3.11",
@@ -31,13 +30,11 @@ multi_pip_parse(
3130
python_interpreter_target = {
3231
"3.10": "@python_3_10_host//:python",
3332
"3.11": "@python_3_11_host//:python",
34-
"3.8": "@python_3_8_host//:python",
3533
"3.9": "@python_3_9_host//:python",
3634
},
3735
requirements_lock = {
3836
"3.10": "//requirements:requirements_lock_3_10.txt",
3937
"3.11": "//requirements:requirements_lock_3_11.txt",
40-
"3.8": "//requirements:requirements_lock_3_8.txt",
4138
"3.9": "//requirements:requirements_lock_3_9.txt",
4239
},
4340
)

examples/multi_python_versions/requirements/BUILD.bazel

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
load("@rules_python//python:pip.bzl", "compile_pip_requirements")
22

3-
compile_pip_requirements(
4-
name = "requirements_3_8",
5-
src = "requirements.in",
6-
python_version = "3.8",
7-
requirements_txt = "requirements_lock_3_8.txt",
8-
)
9-
103
compile_pip_requirements(
114
name = "requirements_3_9",
125
src = "requirements.in",

examples/multi_python_versions/requirements/requirements_lock_3_8.txt

Lines changed: 0 additions & 78 deletions
This file was deleted.

examples/multi_python_versions/tests/BUILD.bazel

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ py_binary(
2222
srcs = ["version_default.py"],
2323
)
2424

25-
py_binary(
26-
name = "version_3_8",
27-
srcs = ["version.py"],
28-
main = "version.py",
29-
python_version = "3.8",
30-
)
31-
3225
py_binary(
3326
name = "version_3_9",
3427
srcs = ["version.py"],
@@ -57,14 +50,6 @@ py_test(
5750
deps = ["//libs/my_lib"],
5851
)
5952

60-
py_test(
61-
name = "my_lib_3_8_test",
62-
srcs = ["my_lib_test.py"],
63-
main = "my_lib_test.py",
64-
python_version = "3.8",
65-
deps = ["//libs/my_lib"],
66-
)
67-
6853
py_test(
6954
name = "my_lib_3_9_test",
7055
srcs = ["my_lib_test.py"],
@@ -102,14 +87,6 @@ py_test(
10287
env = {"VERSION_CHECK": "3.9"}, # The default defined in the WORKSPACE.
10388
)
10489

105-
py_test(
106-
name = "version_3_8_test",
107-
srcs = ["version_test.py"],
108-
env = {"VERSION_CHECK": "3.8"},
109-
main = "version_test.py",
110-
python_version = "3.8",
111-
)
112-
11390
py_test(
11491
name = "version_3_9_test",
11592
srcs = ["version_test.py"],
@@ -169,16 +146,6 @@ sh_test(
169146
},
170147
)
171148

172-
sh_test(
173-
name = "version_test_binary_3_8",
174-
srcs = ["version_test.sh"],
175-
data = [":version_3_8"],
176-
env = {
177-
"VERSION_CHECK": "3.8",
178-
"VERSION_PY_BINARY": "$(rootpaths :version_3_8)",
179-
},
180-
)
181-
182149
sh_test(
183150
name = "version_test_binary_3_9",
184151
srcs = ["version_test.sh"],

0 commit comments

Comments
 (0)