Skip to content

Commit b2626c5

Browse files
committed
Drop parking_lot_core git patch and tkinter deps
Comment out the parking_lot_core git patch and use the crates.io crate. Remove tcl-sys, tk-sys, and the tkinter feature. Assisted-by: Grok:4.7
1 parent be3d12e commit b2626c5

4 files changed

Lines changed: 4 additions & 65 deletions

File tree

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ ssl-rustls-aws-lc = ["ssl-rustls", "dep:rustls", "rustls/aws_lc_rs"]
3131
ssl-rustls-aws-lc-fips = ["ssl-rustls-aws-lc", "rustls/fips"]
3232
ssl-openssl = ["ssl", "rustpython-stdlib/ssl-openssl"]
3333
ssl-openssl-vendor = ["ssl-openssl", "rustpython-stdlib/ssl-openssl-vendor"]
34-
tkinter = ["rustpython-stdlib/tkinter"]
3534

3635
[build-dependencies]
3736
winresource = "0.1"
@@ -129,7 +128,7 @@ strip = true
129128
panic = "abort"
130129

131130
[patch.crates-io]
132-
parking_lot_core = { git = "https://github.com/youknowone/parking_lot", branch = "rustpython" }
131+
# parking_lot_core = { git = "https://github.com/youknowone/parking_lot", branch = "rustpython" }
133132
# REDOX START, Uncomment when you want to compile/check with redoxer
134133
# REDOX END
135134

@@ -298,12 +297,10 @@ strum_macros = "0.28"
298297
syn = "2"
299298
syn-ext = "0.5.0"
300299
system-configuration = "0.8.0"
301-
tcl-sys = { git = "https://github.com/arihant2math/tkinter.git", tag = "v0.2.0" }
302300
textwrap = { version = "0.16.2", default-features = false }
303301
termios = "0.3.3"
304302
thiserror = "2.0"
305303
thin-vec = "0.2.14"
306-
tk-sys = { git = "https://github.com/arihant2math/tkinter.git", tag = "v0.2.0" }
307304
icu_casemap = "2"
308305
icu_locale = "2"
309306
icu_properties = "2"

‎crates/stdlib/Cargo.toml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ ssl = ["rustpython-host_env/ssl"]
2222
ssl-rustls = ["__ssl-rustls", "host_env", "rustls/custom-provider"]
2323
ssl-openssl = ["ssl", "host_env", "openssl", "openssl-sys", "foreign-types-shared", "rustpython-host_env/native-certs"]
2424
ssl-openssl-vendor = ["ssl-openssl", "openssl/vendored"]
25-
tkinter = ["dep:tk-sys", "dep:tcl-sys", "dep:widestring"]
2625
flame-it = ["flame"]
2726

2827
__ssl-rustls = ["ssl", "rustpython-host_env/ssl", "rustpython-host_env/rustls", "rustpython-host_env/native-certs", "rustls", "rustls-pemfile", "x509-parser", "pem-rfc7468", "webpki-roots"]
@@ -71,11 +70,6 @@ constant_time_eq = { workspace = true }
7170
# compression
7271
adler32 = { workspace = true }
7372

74-
# tkinter
75-
tk-sys = { workspace = true, optional = true }
76-
tcl-sys = { workspace = true, optional = true }
77-
widestring = { workspace = true, optional = true }
78-
7973
# uuid
8074
[target.'cfg(not(any(target_os = "ios", target_os = "android", target_os = "windows", target_arch = "wasm32", target_os = "redox")))'.dependencies]
8175
uuid = { workspace = true, features = ["v1"] }

‎crates/stdlib/src/lib.rs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,6 @@ mod termios;
181181
))]
182182
mod uuid;
183183

184-
#[cfg(all(feature = "host_env", feature = "tkinter"))]
185-
mod tkinter;
186-
187184
use rustpython_common as common;
188185
use rustpython_vm as vm;
189186

@@ -309,8 +306,6 @@ pub fn stdlib_module_defs(ctx: &Context) -> Vec<&'static builtins::PyModuleDef>
309306
not(any(target_os = "ios", target_os = "redox"))
310307
))]
311308
termios::module_def(ctx),
312-
#[cfg(all(feature = "host_env", feature = "tkinter"))]
313-
tkinter::module_def(ctx),
314309
unicodedata::module_def(ctx),
315310
#[cfg(all(
316311
feature = "host_env",

0 commit comments

Comments
 (0)