Skip to content

Commit 33e2d69

Browse files
authored
Merge branch 'main' into patch-1
2 parents e103110 + a36d002 commit 33e2d69

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1902
-1254
lines changed

CHANGELOG.md

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,23 +54,31 @@ END_UNRELEASED_TEMPLATE
5454

5555
{#v0-0-0-changed}
5656
### Changed
57+
* (deps) (bzlmod) Upgraded to `bazel-skylib` version
58+
[1.8.1](https://github.com/bazelbuild/bazel-skylib/releases/tag/1.8.1)
59+
to remove deprecation warnings.
5760
* (gazelle) For package mode, resolve dependencies when imports are relative
5861
to the package path. This is enabled via the
59-
`# gazelle:experimental_allow_relative_imports` true directive ({gh-issue}`2203`).
62+
`# gazelle:python_experimental_allow_relative_imports` true directive ({gh-issue}`2203`).
6063
* (gazelle) Types for exposed members of `python.ParserOutput` are now all public.
6164
* (gazelle) Removed the requirement for `__init__.py`, `__main__.py`, or `__test__.py` files to be
6265
present in a directory to generate a `BUILD.bazel` file.
63-
* (toolchain) Updated the following toolchains to build 20250708 to patch CVE-2025-47273:
66+
* (toolchain) Updated the following toolchains to build [20250808] to patch CVE-2025-47273:
6467
* 3.9.23
6568
* 3.10.18
6669
* 3.11.13
6770
* 3.12.11
68-
* 3.14.0b4
69-
* (toolchain) Python 3.13 now references 3.13.5
71+
* 3.14.0rc1
72+
* (toolchain) Python 3.13 now references 3.13.6
7073
* (gazelle) Switched back to smacker/go-tree-sitter, fixing
7174
[#2630](https://github.com/bazel-contrib/rules_python/issues/2630)
7275
* (ci) We are now testing on Ubuntu 22.04 for RBE and non-RBE configurations.
73-
* (core) #!/usr/bin/env bash is now used as a shebang in the stage1 bootstrap template.
76+
* (core) `#!/usr/bin/env bash` is now used as a shebang in the stage1 bootstrap template.
77+
* (gazelle:docs) The Gazelle docs have been migrated from {gh-path}`gazelle/README.md` to
78+
{gh-path}`gazelle/docs` and are now available on the primary documentation site
79+
at https://rules-python.readthedocs.io/en/latest/gazelle/docs/index.html
80+
81+
[20250808]: https://github.com/astral-sh/python-build-standalone/releases/tag/20250808
7482

7583
{#v0-0-0-fixed}
7684
### Fixed
@@ -99,9 +107,21 @@ END_UNRELEASED_TEMPLATE
99107
absolute imports (Python 2's behavior without `absolute_import`). Previous
100108
behavior can be restored using the directive
101109
`# gazelle:python_resolve_sibling_imports true`
110+
* (pypi) Show overridden index URL of packages when downloading metadata have failed.
111+
([#2985](https://github.com/bazel-contrib/rules_python/issues/2985)).
112+
* (toolchains) use "command -v" to find interpreter in `$PATH`
113+
([#3150](https://github.com/bazel-contrib/rules_python/pull/3150)).
114+
* (pypi) `bazel vendor` now works in `bzlmod` ({gh-issue}`3079`).
115+
* (pypi) Correctly pull `sdist` distributions using `pip`
116+
([#3131](https://github.com/bazel-contrib/rules_python/pull/3131)).
117+
* (core) builds work again on `7.x` `WORKSPACE` configurations
118+
([#3119](https://github.com/bazel-contrib/rules_python/issues/3119)).
102119

103120
{#v0-0-0-added}
104121
### Added
122+
* (repl) Default stub now has tab completion, where `readline` support is available,
123+
see ([#3114](https://github.com/bazel-contrib/rules_python/pull/3114)).
124+
([#3114](https://github.com/bazel-contrib/rules_python/pull/3114)).
105125
* (pypi) To configure the environment for `requirements.txt` evaluation, use the newly added
106126
developer preview of the `pip.default` tag class. Only `rules_python` and root modules can use
107127
this feature. You can also configure custom `config_settings` using `pip.default`.
@@ -115,8 +135,8 @@ END_UNRELEASED_TEMPLATE
115135
* (toolchain) Add toolchains for aarch64 windows for
116136
* 3.11.13
117137
* 3.12.11
118-
* 3.13.5
119-
* 3.14.0b4
138+
* 3.13.6
139+
* 3.14.0rc1
120140
* (gazelle): New annotation `gazelle:include_pytest_conftest`. When not set (the
121141
default) or `true`, gazelle will inject any `conftest.py` file found in the same
122142
directory as a {obj}`py_test` target to that {obj}`py_test` target's `deps`.

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module(
55
)
66

77
bazel_dep(name = "bazel_features", version = "1.21.0")
8-
bazel_dep(name = "bazel_skylib", version = "1.7.1")
8+
bazel_dep(name = "bazel_skylib", version = "1.8.1")
99
bazel_dep(name = "rules_cc", version = "0.0.16")
1010
bazel_dep(name = "platforms", version = "0.0.11")
1111

docs/BUILD.bazel

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
1615
load("@bazel_skylib//rules:build_test.bzl", "build_test")
1716
load("@dev_pip//:requirements.bzl", "requirement")
1817
load("//python/private:bzlmod_enabled.bzl", "BZLMOD_ENABLED") # buildifier: disable=bzl-visibility
@@ -56,7 +55,7 @@ sphinx_docs(
5655
"_*",
5756
"*.inv*",
5857
],
59-
),
58+
) + ["//gazelle/docs"],
6059
config = "conf.py",
6160
formats = [
6261
"html",
@@ -189,38 +188,3 @@ lock(
189188
],
190189
visibility = ["//:__subpackages__"],
191190
)
192-
193-
# Temporary compatibility aliases for some other projects depending on the old
194-
# bzl_library targets.
195-
alias(
196-
name = "defs",
197-
actual = "//python:defs_bzl",
198-
deprecation = "Use //python:defs_bzl instead; targets under //docs are internal.",
199-
visibility = ["//visibility:public"],
200-
)
201-
202-
alias(
203-
name = "bazel_repo_tools",
204-
actual = "//python/private:bazel_tools_bzl",
205-
deprecation = "Use @bazel_tools//tools:bzl_srcs instead; targets under //docs are internal.",
206-
visibility = ["//visibility:public"],
207-
)
208-
209-
bzl_library(
210-
name = "pip_install_bzl",
211-
deprecation = "Use //python:pip_bzl or //python/pip_install:pip_repository_bzl instead; " +
212-
"targets under //docs are internal.",
213-
visibility = ["//visibility:public"],
214-
deps = [
215-
"//python:pip_bzl",
216-
"//python/pip_install:pip_repository_bzl",
217-
],
218-
)
219-
220-
alias(
221-
name = "requirements_parser_bzl",
222-
actual = "//python/pip_install:pip_repository_bzl",
223-
deprecation = "Use //python/pip_install:pip_repository_bzl instead; Both the requirements " +
224-
"parser and targets under //docs are internal",
225-
visibility = ["//visibility:public"],
226-
)

docs/README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,20 @@ changes and re-run the build process, and you can simply refresh your browser to
2828
see the changes. Using ibazel is not required; you can manually run the
2929
equivalent bazel command if desired.
3030

31+
An alternative to `ibazel` is using `inotify` on Linux systems:
32+
33+
```
34+
inotifywait --event modify --monitor . --recursive --includei '^.*\.md$' |
35+
while read -r dir events filename; do bazel build //docs:docs; done;
36+
```
37+
38+
And lastly, a poor-man's `ibazel` and `inotify` is simply `watch` with
39+
a reasonable interval like 10s:
40+
41+
```
42+
watch --interval 10 bazel build //docs:docs
43+
```
44+
3145
### Installing ibazel
3246

3347
The `ibazel` tool can be used to automatically rebuild the docs as you

docs/gazelle.md

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

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ pypi/index
9999
Toolchains <toolchains>
100100
coverage
101101
precompiling
102-
gazelle
102+
gazelle/docs/index
103103
REPL <repl>
104104
Extending <extending>
105105
Contributing <contributing>

docs/requirements.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ babel==2.17.0 \
1717
--hash=sha256:0c54cffb19f690cdcc52a3b50bcbf71e07a808d1c80d549f2459b9d2cf0afb9d \
1818
--hash=sha256:4d0b53093fdfb4b21c92b5213dba5a1b23885afa8383709427046b21c366e5f2
1919
# via sphinx
20-
certifi==2025.7.14 \
21-
--hash=sha256:6b31f564a415d79ee77df69d757bb49a5bb53bd9f756cbbe24394ffd6fc1f4b2 \
22-
--hash=sha256:8ea99dbdfaaf2ba2f9bac77b9249ef62ec5218e7c2b2e903378ed5fccf765995
20+
certifi==2025.8.3 \
21+
--hash=sha256:e564105f78ded564e3ae7c923924435e1daa7463faeab5bb932bc53ffae63407 \
22+
--hash=sha256:f6c12493cfb1b06ba2ff328595af9350c65d6644968e5d3a2ffd78699af217a5
2323
# via requests
2424
charset-normalizer==3.4.2 \
2525
--hash=sha256:005fa3432484527f9732ebd315da8da8001593e2cf46a3d817669f062c3d9ed4 \
@@ -297,9 +297,9 @@ requests==2.32.4 \
297297
# via
298298
# readthedocs-sphinx-ext
299299
# sphinx
300-
snowballstemmer==2.2.0 \
301-
--hash=sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1 \
302-
--hash=sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a
300+
snowballstemmer==3.0.1 \
301+
--hash=sha256:6cd7b3897da8d6c9ffb968a6781fa6532dce9c3618a4b127d920dab764a19064 \
302+
--hash=sha256:6d5eeeec8e9f84d4d56b847692bacf79bc2c8e90c7f80ca4444ff8b6f2e52895
303303
# via sphinx
304304
sphinx==8.1.3 \
305305
--hash=sha256:09719015511837b76bf6e03e42eb7595ac8c2e41eeb9c29c5b755c6b677992a2 \

0 commit comments

Comments
 (0)