diff --git a/Cargo.toml b/Cargo.toml index 284567575..eec5d84a8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,92 +1,13 @@ [package] name = "rustpython" -version = "0.4.0" -authors = ["RustPython Team"] -edition = "2021" -rust-version = "1.75.0" description = "A python interpreter written in rust." -repository = "https://github.com/RustPython/RustPython" -license = "MIT" include = ["LICENSE", "Cargo.toml", "src/**/*.rs"] - -[workspace] -resolver = "2" -members = [ - "compiler", "compiler/core", "compiler/codegen", - ".", "common", "derive", "jit", "vm", "vm/sre_engine", "pylib", "stdlib", "wasm/lib", "derive-impl", -] - -[workspace.dependencies] -rustpython-compiler-core = { path = "compiler/core", version = "0.4.0" } -rustpython-compiler = { path = "compiler", version = "0.4.0" } -rustpython-codegen = { path = "compiler/codegen", version = "0.4.0" } -rustpython-common = { path = "common", version = "0.4.0" } -rustpython-derive = { path = "derive", version = "0.4.0" } -rustpython-derive-impl = { path = "derive-impl", version = "0.4.0" } -rustpython-jit = { path = "jit", version = "0.4.0" } -rustpython-vm = { path = "vm", default-features = false, version = "0.4.0" } -rustpython-pylib = { path = "pylib", version = "0.4.0" } -rustpython-stdlib = { path = "stdlib", default-features = false, version = "0.4.0" } -rustpython-sre_engine = { path = "vm/sre_engine", version = "0.4.0" } -rustpython-doc = { git = "https://github.com/RustPython/__doc__", tag = "0.3.0", version = "0.3.0" } - -rustpython-literal = { version = "0.4.0" } -rustpython-parser-core = { version = "0.4.0" } -rustpython-parser = { version = "0.4.0" } -rustpython-ast = { version = "0.4.0" } -rustpython-format= { version = "0.4.0" } -# rustpython-literal = { git = "https://github.com/RustPython/Parser.git", version = "0.4.0", rev = "00d2f1d1a7522ef9c85c10dfa5f0bb7178dee655" } -# rustpython-parser-core = { git = "https://github.com/RustPython/Parser.git", version = "0.4.0", rev = "00d2f1d1a7522ef9c85c10dfa5f0bb7178dee655" } -# rustpython-parser = { git = "https://github.com/RustPython/Parser.git", version = "0.4.0", rev = "00d2f1d1a7522ef9c85c10dfa5f0bb7178dee655" } -# rustpython-ast = { git = "https://github.com/RustPython/Parser.git", version = "0.4.0", rev = "00d2f1d1a7522ef9c85c10dfa5f0bb7178dee655" } -# rustpython-format = { git = "https://github.com/RustPython/Parser.git", version = "0.4.0", rev = "00d2f1d1a7522ef9c85c10dfa5f0bb7178dee655" } -# rustpython-literal = { path = "../RustPython-parser/literal" } -# rustpython-parser-core = { path = "../RustPython-parser/core" } -# rustpython-parser = { path = "../RustPython-parser/parser" } -# rustpython-ast = { path = "../RustPython-parser/ast" } -# rustpython-format = { path = "../RustPython-parser/format" } - -ahash = "0.8.11" -ascii = "1.0" -atty = "0.2.14" -bitflags = "2.4.1" -bstr = "0.2.17" -cfg-if = "1.0" -chrono = "0.4.37" -crossbeam-utils = "0.8.19" -flame = "0.2.2" -glob = "0.3" -hex = "0.4.3" -indexmap = { version = "2.2.6", features = ["std"] } -insta = "1.38.0" -itertools = "0.11.0" -is-macro = "0.3.0" -junction = "1.0.0" -libc = "0.2.153" -log = "0.4.16" -nix = { version = "0.27", features = ["fs", "user", "process", "term", "time", "signal", "ioctl", "socket", "sched", "zerocopy", "dir", "hostname", "net", "poll"] } -malachite-bigint = "0.2.0" -malachite-q = "0.4.4" -malachite-base = "0.4.4" -memchr = "2.7.2" -num-complex = "0.4.0" -num-integer = "0.1.44" -num-traits = "0.2" -num_enum = "0.7" -once_cell = "1.19.0" -parking_lot = "0.12.1" -paste = "1.0.7" -rand = "0.8.5" -rustyline = "14.0.0" -serde = { version = "1.0.133", default-features = false } -schannel = "0.1.22" -static_assertions = "1.1" -syn = "1.0.109" -thiserror = "1.0" -thread_local = "1.1.4" -unicode_names2 = "1.2.0" -widestring = "1.1.0" -windows-sys = "0.52.0" +version.workspace = true +authors.workspace = true +edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true [features] default = ["threading", "stdlib", "zlib", "importlib"] @@ -171,6 +92,93 @@ rev = "2024.02.14" [package.metadata.vcpkg.target] x86_64-pc-windows-msvc = { triplet = "x64-windows-static-md", dev-dependencies = ["openssl" ] } +[workspace] +resolver = "2" +members = [ + "compiler", "compiler/core", "compiler/codegen", + ".", "common", "derive", "jit", "vm", "vm/sre_engine", "pylib", "stdlib", "wasm/lib", "derive-impl", +] + +[workspace.package] +version = "0.4.0" +authors = ["RustPython Team"] +edition = "2021" +rust-version = "1.78.0" +repository = "https://github.com/RustPython/RustPython" +license = "MIT" + +[workspace.dependencies] +rustpython-compiler-core = { path = "compiler/core", version = "0.4.0" } +rustpython-compiler = { path = "compiler", version = "0.4.0" } +rustpython-codegen = { path = "compiler/codegen", version = "0.4.0" } +rustpython-common = { path = "common", version = "0.4.0" } +rustpython-derive = { path = "derive", version = "0.4.0" } +rustpython-derive-impl = { path = "derive-impl", version = "0.4.0" } +rustpython-jit = { path = "jit", version = "0.4.0" } +rustpython-vm = { path = "vm", default-features = false, version = "0.4.0" } +rustpython-pylib = { path = "pylib", version = "0.4.0" } +rustpython-stdlib = { path = "stdlib", default-features = false, version = "0.4.0" } +rustpython-sre_engine = { path = "vm/sre_engine", version = "0.4.0" } +rustpython-doc = { git = "https://github.com/RustPython/__doc__", tag = "0.3.0", version = "0.3.0" } + +rustpython-literal = { version = "0.4.0" } +rustpython-parser-core = { version = "0.4.0" } +rustpython-parser = { version = "0.4.0" } +rustpython-ast = { version = "0.4.0" } +rustpython-format= { version = "0.4.0" } +# rustpython-literal = { git = "https://github.com/RustPython/Parser.git", version = "0.4.0", rev = "00d2f1d1a7522ef9c85c10dfa5f0bb7178dee655" } +# rustpython-parser-core = { git = "https://github.com/RustPython/Parser.git", version = "0.4.0", rev = "00d2f1d1a7522ef9c85c10dfa5f0bb7178dee655" } +# rustpython-parser = { git = "https://github.com/RustPython/Parser.git", version = "0.4.0", rev = "00d2f1d1a7522ef9c85c10dfa5f0bb7178dee655" } +# rustpython-ast = { git = "https://github.com/RustPython/Parser.git", version = "0.4.0", rev = "00d2f1d1a7522ef9c85c10dfa5f0bb7178dee655" } +# rustpython-format = { git = "https://github.com/RustPython/Parser.git", version = "0.4.0", rev = "00d2f1d1a7522ef9c85c10dfa5f0bb7178dee655" } +# rustpython-literal = { path = "../RustPython-parser/literal" } +# rustpython-parser-core = { path = "../RustPython-parser/core" } +# rustpython-parser = { path = "../RustPython-parser/parser" } +# rustpython-ast = { path = "../RustPython-parser/ast" } +# rustpython-format = { path = "../RustPython-parser/format" } + +ahash = "0.8.11" +ascii = "1.0" +atty = "0.2.14" +bitflags = "2.4.1" +bstr = "0.2.17" +cfg-if = "1.0" +chrono = "0.4.37" +crossbeam-utils = "0.8.19" +flame = "0.2.2" +glob = "0.3" +hex = "0.4.3" +indexmap = { version = "2.2.6", features = ["std"] } +insta = "1.38.0" +itertools = "0.11.0" +is-macro = "0.3.0" +junction = "1.0.0" +libc = "0.2.153" +log = "0.4.16" +nix = { version = "0.27", features = ["fs", "user", "process", "term", "time", "signal", "ioctl", "socket", "sched", "zerocopy", "dir", "hostname", "net", "poll"] } +malachite-bigint = "0.2.0" +malachite-q = "0.4.4" +malachite-base = "0.4.4" +memchr = "2.7.2" +num-complex = "0.4.0" +num-integer = "0.1.44" +num-traits = "0.2" +num_enum = "0.7" +once_cell = "1.19.0" +parking_lot = "0.12.1" +paste = "1.0.7" +rand = "0.8.5" +rustyline = "14.0.0" +serde = { version = "1.0.133", default-features = false } +schannel = "0.1.22" +static_assertions = "1.1" +syn = "1.0.109" +thiserror = "1.0" +thread_local = "1.1.4" +unicode_names2 = "1.2.0" +widestring = "1.1.0" +windows-sys = "0.52.0" + # Lints [workspace.lints.rust] diff --git a/common/Cargo.toml b/common/Cargo.toml index 94bee08b7..354dacc08 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "rustpython-common" -version = "0.4.0" description = "General python functions and algorithms for use in RustPython" -authors = ["RustPython Team"] -edition = "2021" -repository = "https://github.com/RustPython/RustPython" -license = "MIT" +version.workspace = true +authors.workspace = true +edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true [features] threading = ["parking_lot"] diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml index 3e017dabe..cb98093c9 100644 --- a/compiler/Cargo.toml +++ b/compiler/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "rustpython-compiler" -version = "0.4.0" description = "A usability wrapper around rustpython-parser and rustpython-compiler-core" -authors = ["RustPython Team"] -repository = "https://github.com/RustPython/RustPython" -license = "MIT" -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true [dependencies] rustpython-codegen = { workspace = true } diff --git a/compiler/codegen/Cargo.toml b/compiler/codegen/Cargo.toml index fe0b42ffa..0fe950be7 100644 --- a/compiler/codegen/Cargo.toml +++ b/compiler/codegen/Cargo.toml @@ -1,11 +1,13 @@ [package] name = "rustpython-codegen" -version = "0.4.0" description = "Compiler for python code into bytecode for the rustpython VM." -authors = ["RustPython Team"] -repository = "https://github.com/RustPython/RustPython" -license = "MIT" -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true + [dependencies] rustpython-ast = { workspace = true, features=["unparse", "constant-optimization"] } diff --git a/compiler/core/Cargo.toml b/compiler/core/Cargo.toml index d7727b713..3d05fc273 100644 --- a/compiler/core/Cargo.toml +++ b/compiler/core/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "rustpython-compiler-core" description = "RustPython specific bytecode." -version = "0.4.0" -authors = ["RustPython Team"] -edition = "2021" -repository = "https://github.com/RustPython/RustPython" -license = "MIT" +version.workspace = true +authors.workspace = true +edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true [dependencies] rustpython-parser-core = { workspace = true, features=["location"] } diff --git a/derive-impl/Cargo.toml b/derive-impl/Cargo.toml index 0eaa2cb49..a843f5d3c 100644 --- a/derive-impl/Cargo.toml +++ b/derive-impl/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "rustpython-derive-impl" -version = "0.4.0" description = "Rust language extensions and macros specific to rustpython." -authors = ["RustPython Team"] -repository = "https://github.com/RustPython/RustPython" -license = "MIT" -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true [dependencies] rustpython-compiler-core = { workspace = true } diff --git a/derive/Cargo.toml b/derive/Cargo.toml index d172f90cb..d38686ce7 100644 --- a/derive/Cargo.toml +++ b/derive/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "rustpython-derive" -version = "0.4.0" description = "Rust language extensions and macros specific to rustpython." -authors = ["RustPython Team"] -repository = "https://github.com/RustPython/RustPython" -license = "MIT" -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true [lib] proc-macro = true diff --git a/jit/Cargo.toml b/jit/Cargo.toml index 6fa518979..cc26eb59a 100644 --- a/jit/Cargo.toml +++ b/jit/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "rustpython-jit" -version = "0.4.0" description = "Experimental JIT(just in time) compiler for python code." -authors = ["RustPython Team"] -repository = "https://github.com/RustPython/RustPython" -license = "MIT" -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true autotests = false diff --git a/pylib/Cargo.toml b/pylib/Cargo.toml index d38359bb2..64a9da021 100644 --- a/pylib/Cargo.toml +++ b/pylib/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "rustpython-pylib" -version = "0.4.0" -authors = ["RustPython Team"] description = "A subset of the Python standard library for use with RustPython" -repository = "https://github.com/RustPython/RustPython" license-file = "Lib/PSF-LICENSE" -edition = "2021" include = ["Cargo.toml", "src/**/*.rs", "Lib/", "!Lib/**/test/", "!Lib/**/*.pyc"] +authors = ["CPython Developers"] +version.workspace = true +edition.workspace = true +rust-version.workspace = true +repository.workspace = true [features] freeze-stdlib = [] diff --git a/stdlib/Cargo.toml b/stdlib/Cargo.toml index 4872b2113..485855d64 100644 --- a/stdlib/Cargo.toml +++ b/stdlib/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "rustpython-stdlib" -version = "0.4.0" description = "RustPython standard libraries in Rust." -authors = ["RustPython Team"] -repository = "https://github.com/RustPython/RustPython" -license = "MIT" -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/vm/Cargo.toml b/vm/Cargo.toml index a00ee79a6..251d482eb 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "rustpython-vm" -version = "0.4.0" description = "RustPython virtual machine." -authors = ["RustPython Team"] -repository = "https://github.com/RustPython/RustPython" -license = "MIT" -edition = "2021" include = ["src/**/*.rs", "Cargo.toml", "build.rs", "Lib/**/*.py"] +version.workspace = true +authors.workspace = true +edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true [features] default = ["compiler"] diff --git a/vm/sre_engine/Cargo.toml b/vm/sre_engine/Cargo.toml index e890730a0..28f98a321 100644 --- a/vm/sre_engine/Cargo.toml +++ b/vm/sre_engine/Cargo.toml @@ -1,13 +1,14 @@ [package] name = "rustpython-sre_engine" -version = "0.4.0" authors = ["Kangzhi Shi ", "RustPython Team"] description = "A low-level implementation of Python's SRE regex engine" -repository = "https://github.com/RustPython/RustPython" -license = "MIT" -edition = "2021" keywords = ["regex"] include = ["LICENSE", "src/**/*.rs"] +version.workspace = true +edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true [dependencies] num_enum = { workspace = true } diff --git a/wasm/lib/Cargo.toml b/wasm/lib/Cargo.toml index 3b3cd8127..9b71bbce2 100644 --- a/wasm/lib/Cargo.toml +++ b/wasm/lib/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "rustpython_wasm" -version = "0.4.0" -authors = ["RustPython Team"] -license = "MIT" description = "A Python-3 (CPython >= 3.5.0) Interpreter written in Rust, compiled to WASM" -repository = "https://github.com/RustPython/RustPython/tree/main/wasm/lib" -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true [lib] crate-type = ["cdylib", "rlib"]