Skip to content

Commit 9367892

Browse files
UebelAndreUebelAndre
authored
Merge branch 'main' into releases
2 parents e64b327 + 5932417 commit 9367892

35 files changed

Lines changed: 321 additions & 314 deletions

‎extensions/pyo3/3rdparty/BUILD.bazel‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ crates_vendor(
2020
build_script_toolchains = [
2121
"@rules_rust_pyo3//:current_pyo3_toolchain",
2222
],
23-
patch_args = ["-p1"],
24-
patches = ["@rules_rust_pyo3//3rdparty/patches:resolve_cross_compile_config_path.patch"],
2523
),
2624
],
2725
"pyo3-ffi": [
@@ -53,13 +51,13 @@ crates_vendor(
5351
"extension-module",
5452
"experimental-inspect",
5553
],
56-
version = "0.28.2",
54+
version = "0.29.0",
5755
),
5856
"pyo3-ffi": crate.spec(
59-
version = "0.28.2",
57+
version = "0.29.0",
6058
),
6159
"pyo3-introspection": crate.spec(
62-
version = "0.28.2",
60+
version = "0.29.0",
6361
),
6462
},
6563
# Name is short to avoid windows paths being too long

‎extensions/pyo3/3rdparty/Cargo.Bazel.lock‎

Lines changed: 12 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎extensions/pyo3/3rdparty/crates/BUILD.bazel‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,37 +32,37 @@ filegroup(
3232

3333
# Workspace Member Dependencies
3434
alias(
35-
name = "pyo3-0.28.2",
36-
actual = "@rpyo3c__pyo3-0.28.2//:pyo3",
35+
name = "pyo3-0.29.0",
36+
actual = "@rpyo3c__pyo3-0.29.0//:pyo3",
3737
tags = ["manual"],
3838
)
3939

4040
alias(
4141
name = "pyo3",
42-
actual = "@rpyo3c__pyo3-0.28.2//:pyo3",
42+
actual = "@rpyo3c__pyo3-0.29.0//:pyo3",
4343
tags = ["manual"],
4444
)
4545

4646
alias(
47-
name = "pyo3-ffi-0.28.2",
48-
actual = "@rpyo3c__pyo3-ffi-0.28.2//:pyo3_ffi",
47+
name = "pyo3-ffi-0.29.0",
48+
actual = "@rpyo3c__pyo3-ffi-0.29.0//:pyo3_ffi",
4949
tags = ["manual"],
5050
)
5151

5252
alias(
5353
name = "pyo3-ffi",
54-
actual = "@rpyo3c__pyo3-ffi-0.28.2//:pyo3_ffi",
54+
actual = "@rpyo3c__pyo3-ffi-0.29.0//:pyo3_ffi",
5555
tags = ["manual"],
5656
)
5757

5858
alias(
59-
name = "pyo3-introspection-0.28.2",
60-
actual = "@rpyo3c__pyo3-introspection-0.28.2//:pyo3_introspection",
59+
name = "pyo3-introspection-0.29.0",
60+
actual = "@rpyo3c__pyo3-introspection-0.29.0//:pyo3_introspection",
6161
tags = ["manual"],
6262
)
6363

6464
alias(
6565
name = "pyo3-introspection",
66-
actual = "@rpyo3c__pyo3-introspection-0.28.2//:pyo3_introspection",
66+
actual = "@rpyo3c__pyo3-introspection-0.29.0//:pyo3_introspection",
6767
tags = ["manual"],
6868
)

extensions/pyo3/3rdparty/crates/BUILD.pyo3-0.28.2.bazel renamed to extensions/pyo3/3rdparty/crates/BUILD.pyo3-0.29.0.bazel

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ rust_library(
4444
"abi3-py312",
4545
"abi3-py313",
4646
"abi3-py314",
47+
"abi3-py315",
4748
"default",
4849
"experimental-inspect",
4950
"extension-module",
@@ -53,7 +54,7 @@ rust_library(
5354
crate_root = "src/lib.rs",
5455
edition = "2021",
5556
proc_macro_deps = [
56-
"@rpyo3c__pyo3-macros-0.28.2//:pyo3_macros",
57+
"@rpyo3c__pyo3-macros-0.29.0//:pyo3_macros",
5758
],
5859
rustc_env_files = [
5960
":cargo_toml_env_vars",
@@ -125,12 +126,12 @@ rust_library(
125126
"@rules_rust//rust/platform:x86_64-unknown-uefi": [],
126127
"//conditions:default": ["@platforms//:incompatible"],
127128
}),
128-
version = "0.28.2",
129+
version = "0.29.0",
129130
deps = [
130131
"@rpyo3c__libc-0.2.176//:libc",
131132
"@rpyo3c__once_cell-1.21.3//:once_cell",
132-
"@rpyo3c__pyo3-0.28.2//:build_script_build",
133-
"@rpyo3c__pyo3-ffi-0.28.2//:pyo3_ffi",
133+
"@rpyo3c__pyo3-0.29.0//:build_script_build",
134+
"@rpyo3c__pyo3-ffi-0.29.0//:pyo3_ffi",
134135
] + select({
135136
"@rules_rust//rust/platform:mips-unknown-linux-gnu": [
136137
"@rpyo3c__portable-atomic-1.11.1//:portable_atomic", # cfg(not(target_has_atomic = "64"))
@@ -191,6 +192,7 @@ cargo_build_script(
191192
"abi3-py312",
192193
"abi3-py313",
193194
"abi3-py314",
195+
"abi3-py315",
194196
"default",
195197
"experimental-inspect",
196198
"extension-module",
@@ -213,8 +215,9 @@ cargo_build_script(
213215
),
214216
edition = "2021",
215217
link_deps = [
216-
"@rpyo3c__pyo3-ffi-0.28.2//:pyo3_ffi",
218+
"@rpyo3c__pyo3-ffi-0.29.0//:pyo3_ffi",
217219
],
220+
links = "pyo3-python",
218221
pkg_name = "pyo3",
219222
rustc_env_files = [
220223
":cargo_toml_env_vars",
@@ -229,10 +232,10 @@ cargo_build_script(
229232
"noclippy",
230233
"norustfmt",
231234
],
232-
version = "0.28.2",
235+
version = "0.29.0",
233236
visibility = ["//visibility:private"],
234237
deps = [
235-
"@rpyo3c__pyo3-build-config-0.28.2//:pyo3_build_config",
238+
"@rpyo3c__pyo3-build-config-0.29.0//:pyo3_build_config",
236239
],
237240
)
238241

extensions/pyo3/3rdparty/crates/BUILD.pyo3-build-config-0.28.2.bazel renamed to extensions/pyo3/3rdparty/crates/BUILD.pyo3-build-config-0.29.0.bazel

Lines changed: 2 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
# bazel run @@//3rdparty:crates_vendor
77
###############################################################################
88

9-
load(
10-
"@rules_rust//cargo:defs.bzl",
11-
"cargo_build_script",
12-
"cargo_toml_env_vars",
13-
)
9+
load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
1410
load("@rules_rust//rust:defs.bzl", "rust_library")
1511

1612
package(default_visibility = ["//visibility:public"])
@@ -39,14 +35,8 @@ rust_library(
3935
],
4036
),
4137
crate_features = [
42-
"abi3",
43-
"abi3-py311",
44-
"abi3-py312",
45-
"abi3-py313",
46-
"abi3-py314",
4738
"default",
4839
"extension-module",
49-
"resolve-config",
5040
],
5141
crate_root = "src/lib.rs",
5242
edition = "2021",
@@ -120,91 +110,8 @@ rust_library(
120110
"@rules_rust//rust/platform:x86_64-unknown-uefi": [],
121111
"//conditions:default": ["@platforms//:incompatible"],
122112
}),
123-
version = "0.28.2",
113+
version = "0.29.0",
124114
deps = [
125-
"@rpyo3c__pyo3-build-config-0.28.2//:build_script_build",
126115
"@rpyo3c__target-lexicon-0.13.3//:target_lexicon",
127116
],
128117
)
129-
130-
cargo_build_script(
131-
name = "_bs",
132-
srcs = glob(
133-
include = ["**/*.rs"],
134-
allow_empty = True,
135-
),
136-
build_script_env = {
137-
"PYO3_CROSS": "$(PYO3_CROSS)",
138-
"PYO3_CROSS_LIB_DIR": "$(PYO3_CROSS_LIB_DIR)",
139-
"PYO3_CROSS_PYTHON_IMPLEMENTATION": "$(PYO3_CROSS_PYTHON_IMPLEMENTATION)",
140-
"PYO3_CROSS_PYTHON_VERSION": "$(PYO3_CROSS_PYTHON_VERSION)",
141-
"PYO3_NO_PYTHON": "$(PYO3_NO_PYTHON)",
142-
"PYO3_PYTHON": "$(PYO3_PYTHON)",
143-
},
144-
compile_data = glob(
145-
include = ["**"],
146-
allow_empty = True,
147-
exclude = [
148-
"**/* *",
149-
"**/*.rs",
150-
".tmp_git_root/**/*",
151-
"BUILD",
152-
"BUILD.bazel",
153-
"WORKSPACE",
154-
"WORKSPACE.bazel",
155-
],
156-
),
157-
crate_features = [
158-
"abi3",
159-
"abi3-py311",
160-
"abi3-py312",
161-
"abi3-py313",
162-
"abi3-py314",
163-
"default",
164-
"extension-module",
165-
"resolve-config",
166-
],
167-
crate_name = "build_script_build",
168-
crate_root = "build.rs",
169-
data = glob(
170-
include = ["**"],
171-
allow_empty = True,
172-
exclude = [
173-
"**/* *",
174-
".tmp_git_root/**/*",
175-
"BUILD",
176-
"BUILD.bazel",
177-
"WORKSPACE",
178-
"WORKSPACE.bazel",
179-
],
180-
) + [
181-
"@rules_rust_pyo3//:current_pyo3_toolchain",
182-
],
183-
edition = "2021",
184-
pkg_name = "pyo3-build-config",
185-
rustc_env_files = [
186-
":cargo_toml_env_vars",
187-
],
188-
rustc_flags = [
189-
"--cap-lints=allow",
190-
],
191-
tags = [
192-
"cargo-bazel",
193-
"crate-name=pyo3-build-config",
194-
"manual",
195-
"noclippy",
196-
"norustfmt",
197-
],
198-
toolchains = ["@rules_rust_pyo3//:current_pyo3_toolchain"],
199-
version = "0.28.2",
200-
visibility = ["//visibility:private"],
201-
deps = [
202-
"@rpyo3c__target-lexicon-0.13.3//:target_lexicon",
203-
],
204-
)
205-
206-
alias(
207-
name = "build_script_build",
208-
actual = ":_bs",
209-
tags = ["manual"],
210-
)

extensions/pyo3/3rdparty/crates/BUILD.pyo3-ffi-0.28.2.bazel renamed to extensions/pyo3/3rdparty/crates/BUILD.pyo3-ffi-0.29.0.bazel

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ rust_library(
4444
"abi3-py312",
4545
"abi3-py313",
4646
"abi3-py314",
47+
"abi3-py315",
4748
"default",
4849
"extension-module",
4950
],
@@ -119,10 +120,10 @@ rust_library(
119120
"@rules_rust//rust/platform:x86_64-unknown-uefi": [],
120121
"//conditions:default": ["@platforms//:incompatible"],
121122
}),
122-
version = "0.28.2",
123+
version = "0.29.0",
123124
deps = [
124125
"@rpyo3c__libc-0.2.176//:libc",
125-
"@rpyo3c__pyo3-ffi-0.28.2//:build_script_build",
126+
"@rpyo3c__pyo3-ffi-0.29.0//:build_script_build",
126127
],
127128
)
128129

@@ -159,6 +160,7 @@ cargo_build_script(
159160
"abi3-py312",
160161
"abi3-py313",
161162
"abi3-py314",
163+
"abi3-py315",
162164
"default",
163165
"extension-module",
164166
],
@@ -195,10 +197,10 @@ cargo_build_script(
195197
"norustfmt",
196198
],
197199
toolchains = ["@rules_rust_pyo3//:current_pyo3_toolchain"],
198-
version = "0.28.2",
200+
version = "0.29.0",
199201
visibility = ["//visibility:private"],
200202
deps = [
201-
"@rpyo3c__pyo3-build-config-0.28.2//:pyo3_build_config",
203+
"@rpyo3c__pyo3-build-config-0.29.0//:pyo3_build_config",
202204
],
203205
)
204206

extensions/pyo3/3rdparty/crates/BUILD.pyo3-introspection-0.28.2.bazel renamed to extensions/pyo3/3rdparty/crates/BUILD.pyo3-introspection-0.29.0.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ rust_library(
106106
"@rules_rust//rust/platform:x86_64-unknown-uefi": [],
107107
"//conditions:default": ["@platforms//:incompatible"],
108108
}),
109-
version = "0.28.2",
109+
version = "0.29.0",
110110
deps = [
111111
"@rpyo3c__anyhow-1.0.100//:anyhow",
112112
"@rpyo3c__goblin-0.10.1//:goblin",

extensions/pyo3/3rdparty/crates/BUILD.pyo3-macros-0.28.2.bazel renamed to extensions/pyo3/3rdparty/crates/BUILD.pyo3-macros-0.29.0.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ rust_proc_macro(
109109
"@rules_rust//rust/platform:x86_64-unknown-uefi": [],
110110
"//conditions:default": ["@platforms//:incompatible"],
111111
}),
112-
version = "0.28.2",
112+
version = "0.29.0",
113113
deps = [
114114
"@rpyo3c__proc-macro2-1.0.101//:proc_macro2",
115-
"@rpyo3c__pyo3-macros-backend-0.28.2//:pyo3_macros_backend",
115+
"@rpyo3c__pyo3-macros-backend-0.29.0//:pyo3_macros_backend",
116116
"@rpyo3c__quote-1.0.41//:quote",
117117
"@rpyo3c__syn-2.0.106//:syn",
118118
],

0 commit comments

Comments
 (0)