Skip to content

Commit c94eeb8

Browse files
committed
Revert tkinter changes
1 parent fc8d704 commit c94eeb8

3 files changed

Lines changed: 47 additions & 10 deletions

File tree

Cargo.lock

Lines changed: 39 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ssl-rustls-aws-lc = ["ssl-rustls", "dep:rustls", "rustls/aws_lc_rs"]
2828
ssl-rustls-aws-lc-fips = ["ssl-rustls-aws-lc", "rustls/fips"]
2929
ssl-openssl = ["ssl", "rustpython-stdlib/ssl-openssl"]
3030
ssl-openssl-vendor = ["ssl-openssl", "rustpython-stdlib/ssl-openssl-vendor"]
31-
# tkinter = ["rustpython-stdlib/tkinter"]
31+
tkinter = ["rustpython-stdlib/tkinter"]
3232

3333
[build-dependencies]
3434
winresource = "0.1"
@@ -307,12 +307,12 @@ strum_macros = "0.28"
307307
syn = "2"
308308
syn-ext = "0.5.0"
309309
system-configuration = "0.7.0"
310-
# tcl-sys = { git = "https://github.com/arihant2math/tkinter.git", tag = "v0.2.0" }
310+
#tcl-sys = { git = "https://github.com/arihant2math/tkinter.git", tag = "v0.2.0" }
311311
textwrap = { version = "0.16.2", default-features = false }
312312
termios = "0.3.3"
313313
thiserror = "2.0"
314314
timsort = "0.1.2"
315-
# tk-sys = { git = "https://github.com/arihant2math/tkinter.git", tag = "v0.2.0" }
315+
tk-sys = { git = "https://github.com/arihant2math/tkinter.git", tag = "v0.2.0" }
316316
icu_casemap = "2"
317317
icu_locale = "2"
318318
icu_properties = "2"

crates/stdlib/Cargo.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ ssl = ["host_env"]
2121
ssl-rustls = ["__ssl-rustls", "rustls/custom-provider"]
2222
ssl-openssl = ["ssl", "openssl", "openssl-sys", "foreign-types-shared", "openssl-probe"]
2323
ssl-openssl-vendor = ["ssl-openssl", "openssl/vendored"]
24-
# TODO: Fix tkinter
25-
tkinter = [
26-
# "dep:tk-sys",
24+
tkinter = [
25+
"dep:tk-sys",
2726
# "dep:tcl-sys",
28-
# "dep:widestring",
27+
"dep:widestring",
2928
]
3029
flame-it = ["flame"]
3130

@@ -110,8 +109,8 @@ libz-rs-sys = { workspace = true }
110109
bzip2 = { workspace = true }
111110

112111
# tkinter
113-
# tk-sys = { workspace = true, optional = true }
114-
# tcl-sys = { workspace = true, optional = true }
112+
tk-sys = { workspace = true, optional = true }
113+
#tcl-sys = { workspace = true, optional = true }
115114
widestring = { workspace = true, optional = true }
116115
chrono = { workspace = true }
117116

0 commit comments

Comments
 (0)