Skip to content

Commit 141ed72

Browse files
authored
Dependencies cleanup (RustPython#6151)
* Update deps * Remove some unused deps * Update lockfile
1 parent 62067ae commit 141ed72

File tree

10 files changed

+250
-250
lines changed

10 files changed

+250
-250
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ rustyline = { workspace = true }
5151

5252
[dev-dependencies]
5353
criterion = { workspace = true }
54-
pyo3 = { version = "0.24", features = ["auto-initialize"] }
54+
pyo3 = { version = "0.26", features = ["auto-initialize"] }
5555

5656
[[bench]]
5757
name = "execution"
@@ -163,27 +163,27 @@ ruff_python_ast = { git = "https://github.com/astral-sh/ruff.git", tag = "0.11.0
163163
ruff_text_size = { git = "https://github.com/astral-sh/ruff.git", tag = "0.11.0" }
164164
ruff_source_file = { git = "https://github.com/astral-sh/ruff.git", tag = "0.11.0" }
165165

166-
ahash = "0.8.11"
166+
ahash = "0.8.12"
167167
ascii = "1.1"
168-
bitflags = "2.9.1"
168+
bitflags = "2.9.4"
169169
bstr = "1"
170170
cfg-if = "1.0"
171-
chrono = "0.4.39"
171+
chrono = "0.4.42"
172172
constant_time_eq = "0.4"
173-
criterion = { version = "0.5", features = ["html_reports"] }
173+
criterion = { version = "0.7", features = ["html_reports"] }
174174
crossbeam-utils = "0.8.21"
175175
flame = "0.2.2"
176176
getrandom = { version = "0.3", features = ["std"] }
177177
glob = "0.3"
178178
hex = "0.4.3"
179-
indexmap = { version = "2.10.0", features = ["std"] }
179+
indexmap = { version = "2.11.3", features = ["std"] }
180180
insta = "1.42"
181181
itertools = "0.14.0"
182182
is-macro = "0.3.7"
183-
junction = "1.2.0"
183+
junction = "1.3.0"
184184
libc = "0.2.169"
185185
libffi = "4.1"
186-
log = "0.4.27"
186+
log = "0.4.28"
187187
nix = { version = "0.30", features = ["fs", "user", "process", "term", "time", "signal", "ioctl", "socket", "sched", "zerocopy", "dir", "hostname", "net", "poll"] }
188188
malachite-bigint = "0.6"
189189
malachite-q = "0.6"
@@ -204,26 +204,26 @@ radium = "1.1.1"
204204
rand = "0.9"
205205
rand_core = { version = "0.9", features = ["os_rng"] }
206206
rustix = { version = "1.0", features = ["event"] }
207-
rustyline = "17.0.0"
208-
serde = { version = "1.0.133", default-features = false }
209-
schannel = "0.1.27"
207+
rustyline = "17.0.1"
208+
serde = { version = "1.0.225", default-features = false }
209+
schannel = "0.1.28"
210210
scoped-tls = "1"
211211
scopeguard = "1"
212212
static_assertions = "1.1"
213213
strum = "0.27"
214214
strum_macros = "0.27"
215215
syn = "2"
216216
thiserror = "2.0"
217-
thread_local = "1.1.8"
218-
unicode-casing = "0.1.0"
217+
thread_local = "1.1.9"
218+
unicode-casing = "0.1.1"
219219
unic-char-property = "0.9.0"
220220
unic-normal = "0.9.0"
221221
unic-ucd-age = "0.9.0"
222222
unic-ucd-bidi = "0.9.0"
223223
unic-ucd-category = "0.9.0"
224224
unic-ucd-ident = "0.9.0"
225-
unicode_names2 = "1.3.0"
226-
unicode-bidi-mirroring = "0.2"
225+
unicode_names2 = "2.0.0"
226+
unicode-bidi-mirroring = "0.4"
227227
widestring = "1.2.0"
228228
windows-sys = "0.59.0"
229229
wasm-bindgen = "0.2.100"

benches/execution.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
use criterion::measurement::WallTime;
21
use criterion::{
3-
Bencher, BenchmarkGroup, BenchmarkId, Criterion, Throughput, black_box, criterion_group,
4-
criterion_main,
2+
Bencher, BenchmarkGroup, BenchmarkId, Criterion, Throughput, criterion_group, criterion_main,
3+
measurement::WallTime,
54
};
65
use rustpython_compiler::Mode;
76
use rustpython_vm::{Interpreter, PyResult, Settings};
8-
use std::collections::HashMap;
9-
use std::path::Path;
7+
use std::{collections::HashMap, hint::black_box, path::Path};
108

119
fn bench_cpython_code(b: &mut Bencher, source: &str) {
1210
let c_str_source_head = std::ffi::CString::new(source).unwrap();
1311
let c_str_source = c_str_source_head.as_c_str();
14-
pyo3::Python::with_gil(|py| {
12+
pyo3::Python::attach(|py| {
1513
b.iter(|| {
1614
let module = pyo3::types::PyModule::from_code(py, c_str_source, c"", c"")
1715
.expect("Error running source");
@@ -54,7 +52,7 @@ pub fn benchmark_file_parsing(group: &mut BenchmarkGroup<WallTime>, name: &str,
5452
});
5553
group.bench_function(BenchmarkId::new("cpython", name), |b| {
5654
use pyo3::types::PyAnyMethods;
57-
pyo3::Python::with_gil(|py| {
55+
pyo3::Python::attach(|py| {
5856
let builtins =
5957
pyo3::types::PyModule::import(py, "builtins").expect("Failed to import builtins");
6058
let compile = builtins.getattr("compile").expect("no compile in builtins");

benches/microbenchmarks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub struct MicroBenchmark {
3737
}
3838

3939
fn bench_cpython_code(group: &mut BenchmarkGroup<WallTime>, bench: &MicroBenchmark) {
40-
pyo3::Python::with_gil(|py| {
40+
pyo3::Python::attach(|py| {
4141
let setup_name = format!("{}_setup", bench.name);
4242
let setup_code = cpy_compile_code(py, &bench.setup, &setup_name).unwrap();
4343

common/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@ rustpython-wtf8 = { workspace = true }
1717

1818
ascii = { workspace = true }
1919
bitflags = { workspace = true }
20-
bstr = { workspace = true }
2120
cfg-if = { workspace = true }
2221
getrandom = { workspace = true }
2322
itertools = { workspace = true }
2423
libc = { workspace = true }
2524
malachite-bigint = { workspace = true }
2625
malachite-q = { workspace = true }
2726
malachite-base = { workspace = true }
28-
memchr = { workspace = true }
2927
num-traits = { workspace = true }
3028
once_cell = { workspace = true }
3129
parking_lot = { workspace = true, optional = true }

compiler/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ ruff_text_size = { workspace = true }
1818
thiserror = { workspace = true }
1919

2020
[dev-dependencies]
21-
rand = { workspace = true }
2221

2322
[lints]
2423
workspace = true

compiler/core/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ bitflags = { workspace = true }
1717
itertools = { workspace = true }
1818
malachite-bigint = { workspace = true }
1919
num-complex = { workspace = true }
20-
serde = { workspace = true, optional = true, default-features = false, features = ["derive"] }
2120

2221
lz4_flex = "0.11"
2322

2423
[lints]
25-
workspace = true
24+
workspace = true

derive/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ proc-macro = true
1414
[dependencies]
1515
rustpython-compiler = { workspace = true }
1616
rustpython-derive-impl = { workspace = true }
17-
proc-macro2 = { workspace = true }
1817
syn = { workspace = true }
1918

2019
[lints]
21-
workspace = true
20+
workspace = true

stdlib/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ lzma-sys = "0.1"
117117
xz2 = "0.1"
118118

119119
[target.'cfg(windows)'.dependencies]
120-
junction = { workspace = true }
121120
paste = { workspace = true }
122121
schannel = { workspace = true }
123122
widestring = { workspace = true }

vm/Cargo.toml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ itertools = { workspace = true }
5656
is-macro = { workspace = true }
5757
libc = { workspace = true }
5858
log = { workspace = true }
59-
nix = { workspace = true }
6059
malachite-bigint = { workspace = true }
6160
num-complex = { workspace = true }
6261
num-integer = { workspace = true }
@@ -76,15 +75,13 @@ thread_local = { workspace = true }
7675
memchr = { workspace = true }
7776

7877
caseless = "0.2.2"
79-
flamer = { version = "0.4", optional = true }
78+
flamer = { version = "0.5", optional = true }
8079
half = "2"
81-
memoffset = "0.9.1"
8280
optional = { workspace = true }
8381
result-like = "0.5.0"
8482
timsort = "0.1.2"
8583

8684
## unicode stuff
87-
unicode_names2 = { workspace = true }
8885
# TODO: use unic for this; needed for title case:
8986
# https://github.com/RustPython/RustPython/pull/832#discussion_r275428939
9087
unicode-casing = { workspace = true }
@@ -95,6 +92,7 @@ unic-ucd-ident = { workspace = true }
9592

9693
[target.'cfg(unix)'.dependencies]
9794
rustix = { workspace = true }
95+
nix = { workspace = true }
9896
exitcode = "1.1.2"
9997
uname = "0.1.1"
10098

@@ -113,7 +111,6 @@ num_cpus = "1.17.0"
113111

114112
[target.'cfg(windows)'.dependencies]
115113
junction = { workspace = true }
116-
schannel = { workspace = true }
117114
winreg = "0.55"
118115

119116
[target.'cfg(windows)'.dependencies.windows]

0 commit comments

Comments
 (0)