diff --git a/Cargo.toml b/Cargo.toml index 365a3aaa3..25f8c3add 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,27 +35,26 @@ ssl-vendor = ["rustpython-stdlib/ssl-vendor"] [dependencies] rustpython-compiler = { path = "compiler", version = "0.1.1" } rustpython-parser = { path = "compiler/parser", version = "0.1.1" } -rustpython-vm = { path = "vm", version = "0.1.1", default-features = false, features = ["compiler"] } rustpython-stdlib = {path = "stdlib", optional = true, default-features = false} +rustpython-vm = { path = "vm", version = "0.1.1", default-features = false, features = ["compiler"] } -log = "0.4.16" -env_logger = { version = "0.9.0", default-features = false, features = ["atty", "termcolor"] } +cfg-if = "1.0.0" clap = "2.34" dirs = { package = "dirs-next", version = "2.0.0" } -num-traits = "0.2.14" -cfg-if = "1.0.0" -libc = "0.2.126" - +env_logger = { version = "0.9.0", default-features = false, features = ["atty", "termcolor"] } flame = { version = "0.2.2", optional = true } flamescope = { version = "0.1.2", optional = true } +libc = "0.2.126" +log = "0.4.16" +num-traits = "0.2.14" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] rustyline = "10.0.0" [dev-dependencies] cpython = "0.7.0" -python3-sys = "0.7.0" criterion = "0.3.5" +python3-sys = "0.7.0" [[bench]] name = "execution" diff --git a/common/Cargo.toml b/common/Cargo.toml index 16c4538eb..8b842b0fe 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -8,22 +8,22 @@ edition = "2021" threading = ["parking_lot"] [dependencies] -lock_api = "0.4" -parking_lot = { version = "0.12.0", optional = true } -num-traits = "0.2" -num-complex = "0.4.0" -num-bigint = "0.4.2" -lexical-parse-float = { version = "0.8.0", features = ["format"] } -hexf-parse = "0.2.1" -cfg-if = "1.0" -once_cell = "1.4.1" -siphasher = "0.3" -rand = "0.8" -volatile = "0.3" -radium = "0.7" -libc = "0.2.126" ascii = "1.0" +cfg-if = "1.0" +hexf-parse = "0.2.1" +lexical-parse-float = { version = "0.8.0", features = ["format"] } +libc = "0.2.126" +lock_api = "0.4" +num-bigint = "0.4.2" +num-complex = "0.4.0" +num-traits = "0.2" +once_cell = "1.4.1" +parking_lot = { version = "0.12.0", optional = true } +radium = "0.7" +rand = "0.8" +siphasher = "0.3" unic-ucd-category = "0.9" +volatile = "0.3" [target.'cfg(windows)'.dependencies] widestring = "0.5.1" diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml index c2e22b152..00fc91479 100644 --- a/compiler/Cargo.toml +++ b/compiler/Cargo.toml @@ -6,8 +6,8 @@ authors = ["RustPython Team"] edition = "2021" [dependencies] +rustpython-bytecode = { path = "bytecode" } rustpython-codegen = { path = "codegen" } rustpython-parser = { path = "parser" } -rustpython-bytecode = { path = "bytecode" } thiserror = "1.0" diff --git a/compiler/ast/Cargo.toml b/compiler/ast/Cargo.toml index 144ba6214..39eedf4f4 100644 --- a/compiler/ast/Cargo.toml +++ b/compiler/ast/Cargo.toml @@ -12,5 +12,5 @@ unparse = ["rustpython-common"] [dependencies] num-bigint = "0.4.3" +rustpython-bytecode = { path = "../bytecode" } rustpython-common = { path = "../../common", optional = true } -rustpython-bytecode = { path = "../bytecode"} diff --git a/compiler/bytecode/Cargo.toml b/compiler/bytecode/Cargo.toml index 1457072b8..05d698ede 100644 --- a/compiler/bytecode/Cargo.toml +++ b/compiler/bytecode/Cargo.toml @@ -7,14 +7,13 @@ edition = "2021" repository = "https://github.com/RustPython/RustPython" license = "MIT" - [dependencies] bincode = "1.3.3" bitflags = "1.3.2" +bstr = "0.2.17" +itertools = "0.10.3" lz4_flex = "0.9.2" num-bigint = { version = "0.4.3", features = ["serde"] } num-complex = { version = "0.4.0", features = ["serde"] } serde = { version = "1.0.136", features = ["derive"] } -itertools = "0.10.3" -bstr = "0.2.17" static_assertions = "1.1.0" diff --git a/compiler/codegen/Cargo.toml b/compiler/codegen/Cargo.toml index 3a770df3c..77cd70735 100644 --- a/compiler/codegen/Cargo.toml +++ b/compiler/codegen/Cargo.toml @@ -8,15 +8,17 @@ license = "MIT" edition = "2021" [dependencies] +rustpython-ast = { path = "../ast", features = ["unparse"] } +rustpython-bytecode = { path = "../bytecode", version = "0.1.1" } + +ahash = "0.7.6" indexmap = "1.8.1" itertools = "0.10.3" -rustpython-bytecode = { path = "../bytecode", version = "0.1.1" } -rustpython-ast = { path = "../ast", features = ["unparse"] } +log = "0.4.16" num-complex = { version = "0.4.0", features = ["serde"] } num-traits = "0.2.14" -log = "0.4.16" -ahash = "0.7.6" [dev-dependencies] rustpython-parser = { path = "../parser" } + insta = "1.14.0" diff --git a/compiler/parser/Cargo.toml b/compiler/parser/Cargo.toml index 60dabdcc3..2522e726f 100644 --- a/compiler/parser/Cargo.toml +++ b/compiler/parser/Cargo.toml @@ -2,7 +2,7 @@ name = "rustpython-parser" version = "0.1.2" description = "Parser for python code." -authors = [ "RustPython Team" ] +authors = ["RustPython Team"] build = "build.rs" repository = "https://github.com/RustPython/RustPython" license = "MIT" @@ -15,6 +15,8 @@ phf_codegen = "0.10" tiny-keccak = { version = "2", features = ["sha3"] } [dependencies] +rustpython-ast = { path = "../ast" } + ahash = "0.7.6" itertools = "0.10.3" lalrpop-util = "0.19.8" @@ -22,7 +24,6 @@ log = "0.4.16" num-bigint = "0.4.3" num-traits = "0.2.14" phf = "0.10.1" -rustpython-ast = { path = "../ast" } unic-emoji-char = "0.9.0" unic-ucd-ident = "0.9.0" unicode_names2 = "0.5.0" diff --git a/derive/Cargo.toml b/derive/Cargo.toml index 284584579..594750bc1 100644 --- a/derive/Cargo.toml +++ b/derive/Cargo.toml @@ -11,17 +11,17 @@ edition = "2021" proc-macro = true [dependencies] -rustpython-compiler = { path = "../compiler", version = "0.1.1" } rustpython-bytecode = { path = "../compiler/bytecode", version = "0.1.1" } rustpython-codegen = { path = "../compiler/codegen", version = "0.1.1" } +rustpython-compiler = { path = "../compiler", version = "0.1.1" } +rustpython-doc = { git = "https://github.com/RustPython/__doc__", branch = "main" } -syn = { version = "1.0.91", features = ["full", "extra-traits"] } -syn-ext = { version = "0.4.0", features = ["full"] } -quote = "1.0.18" -proc-macro2 = "1.0.37" -maplit = "1.0.2" -once_cell = "1.10.0" -textwrap = { version = "0.15.0", default-features = false } indexmap = "1.8.1" itertools = "0.10.3" -rustpython-doc = { git = "https://github.com/RustPython/__doc__", branch = "main" } +maplit = "1.0.2" +once_cell = "1.10.0" +proc-macro2 = "1.0.37" +quote = "1.0.18" +syn = { version = "1.0.91", features = ["full", "extra-traits"] } +syn-ext = { version = "0.4.0", features = ["full"] } +textwrap = { version = "0.15.0", default-features = false } diff --git a/jit/Cargo.toml b/jit/Cargo.toml index 3c0e4432e..23e3304d0 100644 --- a/jit/Cargo.toml +++ b/jit/Cargo.toml @@ -2,7 +2,7 @@ name = "rustpython-jit" version = "0.1.2" description = "Experimental JIT(just in time) compiler for python code." -authors = [ "RustPython Team" ] +authors = ["RustPython Team"] repository = "https://github.com/RustPython/RustPython" license = "MIT" edition = "2021" @@ -13,10 +13,10 @@ autotests = false rustpython-bytecode = { path = "../compiler/bytecode", version = "0.1.2" } cranelift = "0.76.0" -cranelift-module = "0.76.0" cranelift-jit = "0.76.0" -num-traits = "0.2" +cranelift-module = "0.76.0" libffi = "2.0.0" +num-traits = "0.2" thiserror = "1.0" [dev-dependencies] diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml index 421b5e66d..508ec7a88 100644 --- a/stdlib/Cargo.toml +++ b/stdlib/Cargo.toml @@ -5,7 +5,15 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[features] +threading = ["rustpython-common/threading", "rustpython-vm/threading"] +zlib = ["libz-sys", "flate2/zlib"] +bz2 = ["bzip2"] +ssl = ["openssl", "openssl-sys", "foreign-types-shared"] +ssl-vendor = ["ssl", "openssl/vendored", "openssl-probe"] + [dependencies] +# rustpython crates rustpython-derive = { path = "../derive" } rustpython-vm = { path = "../vm" } rustpython-common = { path = "../common" } @@ -79,14 +87,6 @@ page_size = "0.4" [target.'cfg(all(unix, not(target_os = "redox"), not(target_os = "ios")))'.dependencies] termios = "0.3.3" -[features] -threading = ["rustpython-common/threading", "rustpython-vm/threading"] - -zlib = ["libz-sys", "flate2/zlib"] -bz2 = ["bzip2"] -ssl = ["openssl", "openssl-sys", "foreign-types-shared"] -ssl-vendor = ["ssl", "openssl/vendored", "openssl-probe"] - [target.'cfg(not(target_arch = "wasm32"))'.dependencies] gethostname = "0.2.3" socket2 = { version = "0.4.4", features = ["all"] } diff --git a/vm/pylib-crate/Cargo.toml b/vm/pylib-crate/Cargo.toml index 9e159156b..79c7cb3a0 100644 --- a/vm/pylib-crate/Cargo.toml +++ b/vm/pylib-crate/Cargo.toml @@ -12,8 +12,8 @@ include = ["Cargo.toml", "src/**/*.rs", "Lib/", "!Lib/**/test/", "!Lib/**/*.pyc" freeze-stdlib = [] [dependencies] -rustpython-derive = { version = "0.1.2", path = "../../derive" } rustpython-bytecode = { version = "0.1.2", path = "../../compiler/bytecode" } +rustpython-derive = { version = "0.1.2", path = "../../derive" } [build-dependencies] glob = "0.3" diff --git a/wasm/lib/Cargo.toml b/wasm/lib/Cargo.toml index 2b8f2f5f0..5109ea30d 100644 --- a/wasm/lib/Cargo.toml +++ b/wasm/lib/Cargo.toml @@ -16,23 +16,21 @@ freeze-stdlib = ["rustpython-vm/freeze-stdlib"] no-start-func = [] [dependencies] -rustpython-parser = { path = "../../compiler/parser" } rustpython-common = { path = "../../common" } +rustpython-parser = { path = "../../compiler/parser" } +rustpython-stdlib = { path = "../../stdlib", default-features = false, optional = true } # make sure no threading! otherwise wasm build will fail rustpython-vm = { path = "../../vm", default-features = false, features = ["compiler", "encodings"] } -rustpython-stdlib = { path = "../../stdlib", default-features = false, optional = true } -wasm-bindgen = "0.2" -wasm-bindgen-futures = "0.4" -serde-wasm-bindgen = "0.3.1" -serde = "1.0" -js-sys = "0.3" + console_error_panic_hook = "0.1" +js-sys = "0.3" # make parking_lot use wasm-bingden for instant parking_lot = { version = "0.12.0" } - -[dependencies.web-sys] -version = "0.3" -features = [ +serde = "1.0" +serde-wasm-bindgen = "0.3.1" +wasm-bindgen = "0.2" +wasm-bindgen-futures = "0.4" +web-sys = { version = "0.3", features = [ "console", "Document", "Element", @@ -41,7 +39,7 @@ features = [ "Request", "RequestInit", "Response" -] +] } [package.metadata.wasm-pack.profile.release] wasm-opt = false#["-O1"]