Skip to content

Commit 638e36a

Browse files
committed
Merge branch 'main' into refactor/remove-uname-dep
2 parents 8799dc3 + c8ccd22 commit 638e36a

File tree

21 files changed

+570
-847
lines changed

21 files changed

+570
-847
lines changed

.bcr/gazelle/metadata.template.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
"github": "rickeylev"
88
},
99
{
10-
"name": "Thulio Ferraz Assis",
11-
"email": "[email protected]",
12-
"github": "f0rmiga"
10+
"name": "Ignas Anikevicius",
11+
"email": "[email protected]",
12+
"github": "aignas"
1313
}
1414
],
1515
"repository": [

.bcr/gazelle/presubmit.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ bcr_test_module:
1616
module_path: "../examples/bzlmod_build_file_generation"
1717
matrix:
1818
platform: ["debian11", "macos", "ubuntu2004", "windows"]
19-
bazel: [6.x, 7.x]
19+
# last_rc is to get latest 8.x release. Replace with 8.x when available.
20+
bazel: [7.x, last_rc]
2021
tasks:
2122
run_tests:
2223
name: "Run test module"

.bcr/metadata.template.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
"email": "[email protected]",
77
"github": "rickeylev"
88
},
9-
{
10-
"name": "Thulio Ferraz Assis",
11-
"email": "[email protected]",
12-
"github": "f0rmiga"
13-
},
149
{
1510
"name": "Ignas Anikevicius",
1611
"email": "[email protected]",

.bcr/presubmit.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ bcr_test_module:
1616
module_path: "examples/bzlmod"
1717
matrix:
1818
platform: ["debian11", "macos", "ubuntu2004", "windows"]
19-
bazel: [6.x, 7.x]
19+
# last_rc is to get latest 8.x release. Replace with 8.x when available.
20+
bazel: [7.x, last_rc]
2021
tasks:
2122
run_tests:
2223
name: "Run test module"

CHANGELOG.md

Lines changed: 53 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,60 @@ A brief description of the categories of changes:
2020
* Particular sub-systems are identified using parentheses, e.g. `(bzlmod)` or
2121
`(docs)`.
2222

23+
<!--
24+
Unreleased changes template.
25+
26+
{#v0-0-0}
27+
## Unreleased
28+
29+
[0.0.0]: https://github.com/bazelbuild/rules_python/releases/tag/0.0.0
30+
31+
{#v0-0-0-changed}
32+
### Changed
33+
* Nothing yet.
34+
35+
{#v0-0-0-fixed}
36+
### Fixed
37+
* Nothing yet.
38+
39+
{#v0-0-0-added}
40+
### Added
41+
* Nothing yet.
42+
43+
{#v0-0-0-removed}
44+
### Removed
45+
* Nothing yet.
46+
-->
47+
2348
{#v0-0-0}
2449
## Unreleased
2550

2651
[0.0.0]: https://github.com/bazelbuild/rules_python/releases/tag/0.0.0
2752

2853
{#v0-0-0-changed}
2954
### Changed
55+
* Nothing yet.
56+
57+
{#v0-0-0-fixed}
58+
### Fixed
59+
* Nothing yet.
60+
61+
{#v0-0-0-added}
62+
### Added
63+
* Nothing yet.
64+
65+
{#v0-0-0-removed}
66+
### Removed
67+
* (publish) Remove deprecated `requirements.txt` for the `twine` dependencies.
68+
Please use `requirements_linux.txt` instead.
69+
70+
{#v0-39-0}
71+
## [0.39.0] - 2024-11-13
72+
73+
[0.39.0]: https://github.com/bazelbuild/rules_python/releases/tag/0.39.0
74+
75+
{#v0-39-0-changed}
76+
### Changed
3077
* (deps) bazel_skylib 1.6.1 -> 1.7.1
3178
* (deps) rules_cc 0.0.9 -> 0.0.14
3279
* (deps) protobuf 24.4 -> 29.0-rc2
@@ -47,11 +94,13 @@ A brief description of the categories of changes:
4794

4895
[20241016]: https://github.com/indygreg/python-build-standalone/releases/tag/20241016
4996

50-
{#v0-0-0-fixed}
97+
{#v0-39-0-fixed}
5198
### Fixed
52-
* Nothing yet
99+
* (precompiling) Skip precompiling (instead of erroring) if the legacy
100+
`@bazel_tools//tools/python:autodetecting_toolchain` is being used
101+
([#2364](https://github.com/bazelbuild/rules_python/issues/2364)).
53102

54-
{#v0-0-0-added}
103+
{#v0-39-0-added}
55104
### Added
56105
* Bazel 8 is now supported.
57106
* (toolchain) Support for freethreaded Python toolchains is now available. Use
@@ -60,7 +109,7 @@ A brief description of the categories of changes:
60109
* (toolchain) {obj}`py_runtime.abi_flags` attribute and
61110
{obj}`PyRuntimeInfo.abi_flags` field added.
62111

63-
{#v0-0-0-removed}
112+
{#v0-39-0-removed}
64113
### Removed
65114
* Support for Bazel 6 using bzlmod has been dropped.
66115

MODULE.bazel

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,7 @@ bazel_dep(name = "bazel_ci_rules", version = "1.0.0", dev_dependency = True)
8484
# We use `WORKSPACE.bzlmod` because it is impossible to have dev-only local overrides.
8585
bazel_dep(name = "rules_go", version = "0.41.0", dev_dependency = True, repo_name = "io_bazel_rules_go")
8686
bazel_dep(name = "rules_python_gazelle_plugin", version = "0", dev_dependency = True)
87-
bazel_dep(name = "gazelle", version = "0.33.0", dev_dependency = True, repo_name = "bazel_gazelle")
88-
single_version_override(
89-
module_name = "gazelle",
90-
patch_strip = 1,
91-
patches = [
92-
# Can be removed once https://github.com/bazel-contrib/bazel-gazelle/issues/1959
93-
# is fixed and released.
94-
"patches/gazelle_native_sh.patch",
95-
],
96-
version = "0.33.0",
97-
)
87+
bazel_dep(name = "gazelle", version = "0.40.0", dev_dependency = True, repo_name = "bazel_gazelle")
9888

9989
internal_dev_deps = use_extension(
10090
"//python/private:internal_dev_deps.bzl",

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ pip_parse(
9898
name = "rules_python_publish_deps",
9999
python_interpreter_target = interpreter,
100100
requirements_darwin = "//tools/publish:requirements_darwin.txt",
101-
requirements_lock = "//tools/publish:requirements.txt",
101+
requirements_lock = "//tools/publish:requirements_linux.txt",
102102
requirements_windows = "//tools/publish:requirements_windows.txt",
103103
)
104104

0 commit comments

Comments
 (0)