mirror of
https://github.com/RustPython/RustPython.git
synced 2026-10-28 10:44:36 +08:00
Fix CI failures and bump version to 0.6.1 (#8940)
* Use AtomicPyTypeFlags in PyType_FromSlots PyType_FromSlots still imported the old PyAtomicTypeFlags name. Assisted-by: Grok:4.7 * Pass CPython test args as a bash array Assisted-by: Grok:4.7 * Bump workspace version to 0.6.1 Assisted-by: Grok:4.7 * Restore the CPython test step in ci.yaml Assisted-by: Grok:4.7
This commit is contained in:
1 parent
e1dba29fb2
commit
1f83b1593f
4 files changed
+41
-41
No files matched your search
Generated
+20
-20
@@ -3694,7 +3694,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"codspeed-criterion-compat",
|
||||
"dirs",
|
||||
@@ -3720,7 +3720,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-capi"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"bitflags 2.13.1",
|
||||
"itertools 0.15.0",
|
||||
@@ -3735,7 +3735,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-codegen"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"bitflags 2.13.1",
|
||||
"indexmap",
|
||||
@@ -3758,7 +3758,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-common"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"ascii",
|
||||
"base64",
|
||||
@@ -3797,7 +3797,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-compiler"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"rustpython-codegen",
|
||||
"rustpython-compiler-core",
|
||||
@@ -3810,7 +3810,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-compiler-core"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"bitflags 2.13.1",
|
||||
"bitflagset",
|
||||
@@ -3825,7 +3825,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-derive"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"rustpython-compiler",
|
||||
"rustpython-derive-impl",
|
||||
@@ -3834,7 +3834,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-derive-impl"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"itertools 0.15.0",
|
||||
"proc-macro2",
|
||||
@@ -3848,14 +3848,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-doc"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"xz",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-host_env"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"bitflags 2.13.1",
|
||||
"bitflagset",
|
||||
@@ -3897,7 +3897,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-jit"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"approx",
|
||||
"cranelift",
|
||||
@@ -3913,7 +3913,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-literal"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"hexf-parse",
|
||||
"is-macro",
|
||||
@@ -3926,7 +3926,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-pylib"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"glob",
|
||||
"rustpython-compiler-core",
|
||||
@@ -4012,7 +4012,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-sre_engine"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"bitflags 2.13.1",
|
||||
"codspeed-criterion-compat",
|
||||
@@ -4024,7 +4024,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-stdlib"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"adler32",
|
||||
"ascii",
|
||||
@@ -4078,7 +4078,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-unicode"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"icu_casemap",
|
||||
"icu_locale",
|
||||
@@ -4092,11 +4092,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-venvlauncher"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-vm"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"ascii",
|
||||
"bitflags 2.13.1",
|
||||
@@ -4156,7 +4156,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython-wtf8"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"ascii",
|
||||
"bstr",
|
||||
@@ -4166,7 +4166,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustpython_wasm"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
dependencies = [
|
||||
"console_error_panic_hook",
|
||||
"getrandom 0.2.17",
|
||||
|
||||
+18
-18
@@ -161,7 +161,7 @@ members = [
|
||||
exclude = ["pymath"]
|
||||
|
||||
[workspace.package]
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
authors = ["RustPython Team"]
|
||||
edition = "2024"
|
||||
rust-version = "1.95.0"
|
||||
@@ -169,23 +169,23 @@ repository = "https://github.com/RustPython/RustPython"
|
||||
license = "MIT"
|
||||
|
||||
[workspace.dependencies]
|
||||
rustpython-capi = { path = "crates/capi", version = "0.6.0" }
|
||||
rustpython-compiler-core = { path = "crates/compiler-core", version = "0.6.0" }
|
||||
rustpython-compiler = { path = "crates/compiler", version = "0.6.0" }
|
||||
rustpython-codegen = { path = "crates/codegen", version = "0.6.0" }
|
||||
rustpython-common = { path = "crates/common", version = "0.6.0" }
|
||||
rustpython-host_env = { path = "crates/host_env", version = "0.6.0" }
|
||||
rustpython-derive = { path = "crates/derive", version = "0.6.0" }
|
||||
rustpython-derive-impl = { path = "crates/derive-impl", version = "0.6.0" }
|
||||
rustpython-jit = { path = "crates/jit", version = "0.6.0" }
|
||||
rustpython-literal = { path = "crates/literal", version = "0.6.0" }
|
||||
rustpython-vm = { path = "crates/vm", default-features = false, version = "0.6.0" }
|
||||
rustpython-pylib = { path = "crates/pylib", version = "0.6.0" }
|
||||
rustpython-stdlib = { path = "crates/stdlib", default-features = false, version = "0.6.0" }
|
||||
rustpython-sre_engine = { path = "crates/sre_engine", version = "0.6.0" }
|
||||
rustpython-unicode = { path = "crates/unicode", version = "0.6.0" }
|
||||
rustpython-wtf8 = { path = "crates/wtf8", version = "0.6.0" }
|
||||
rustpython-doc = { path = "crates/doc", version = "0.6.0" }
|
||||
rustpython-capi = { path = "crates/capi", version = "0.6.1" }
|
||||
rustpython-compiler-core = { path = "crates/compiler-core", version = "0.6.1" }
|
||||
rustpython-compiler = { path = "crates/compiler", version = "0.6.1" }
|
||||
rustpython-codegen = { path = "crates/codegen", version = "0.6.1" }
|
||||
rustpython-common = { path = "crates/common", version = "0.6.1" }
|
||||
rustpython-host_env = { path = "crates/host_env", version = "0.6.1" }
|
||||
rustpython-derive = { path = "crates/derive", version = "0.6.1" }
|
||||
rustpython-derive-impl = { path = "crates/derive-impl", version = "0.6.1" }
|
||||
rustpython-jit = { path = "crates/jit", version = "0.6.1" }
|
||||
rustpython-literal = { path = "crates/literal", version = "0.6.1" }
|
||||
rustpython-vm = { path = "crates/vm", default-features = false, version = "0.6.1" }
|
||||
rustpython-pylib = { path = "crates/pylib", version = "0.6.1" }
|
||||
rustpython-stdlib = { path = "crates/stdlib", default-features = false, version = "0.6.1" }
|
||||
rustpython-sre_engine = { path = "crates/sre_engine", version = "0.6.1" }
|
||||
rustpython-unicode = { path = "crates/unicode", version = "0.6.1" }
|
||||
rustpython-wtf8 = { path = "crates/wtf8", version = "0.6.1" }
|
||||
rustpython-doc = { path = "crates/doc", version = "0.6.1" }
|
||||
|
||||
# Use the RustPython Ruff fork for RustPython public `_ast` metadata.
|
||||
ruff_python_parser = { package = "rustpython-ruff_python_parser", version = "0.16.5" }
|
||||
|
||||
@@ -8,7 +8,7 @@ use crate::util::FfiPtrExt;
|
||||
use core::ffi::{c_char, c_int, c_ulong, c_void};
|
||||
use rustpython_vm::builtins::{PyStr, PyType};
|
||||
use rustpython_vm::function::{ItemDoc, PyMethodFlags};
|
||||
use rustpython_vm::types::{PyAtomicTypeFlags, PyTypeFlags, PyTypeSlots, SlotAccessor};
|
||||
use rustpython_vm::types::{AtomicPyTypeFlags, PyTypeFlags, PyTypeSlots, SlotAccessor};
|
||||
use rustpython_vm::{AsObject, Py, PyObject};
|
||||
|
||||
pub type PyTypeObject = Py<PyType>;
|
||||
@@ -129,7 +129,7 @@ pub extern "C" fn PyType_FromSlots(slots: *const PySlot) -> *mut PyObject {
|
||||
"Invalid type flags: {value:#x} for PyType_FromSlots"
|
||||
))
|
||||
})?;
|
||||
type_slots.flags = PyAtomicTypeFlags::new(flags);
|
||||
type_slots.flags = AtomicPyTypeFlags::from_plain(flags);
|
||||
}
|
||||
PySlotType::BasicSize(size) | PySlotType::ExtraBasicSize(size) => {
|
||||
if size != 0 {
|
||||
|
||||
Reference in new issue
Block a user