mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 10:58:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Avoid repeating paths of workspace packages (#2573)

Browse source 
Scott schafer got me the idea: We can avoid repeating the path for
workspaces dependencies everywhere if we declare them in the virtual
package once and treat them as workspace dependencies from there on.
This commit is contained in:
konsti 2024-03-20 21:16:02 +01:00 • committed by GitHub
parent 7111fdd637
commit 70e0967dbd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 200 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Cargo.toml
View file

@ -17,6 +17,37 @@ authors = ["uv"]
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
[workspace.dependencies] [workspace.dependencies]
cache-key = { path = "crates/cache-key" }
distribution-filename = { path = "crates/distribution-filename" }
distribution-types = { path = "crates/distribution-types" }
install-wheel-rs = { path = "crates/install-wheel-rs" }
once-map = { path = "crates/once-map" }
pep440_rs = { path = "crates/pep440-rs" }
pep508_rs = { path = "crates/pep508-rs" }
platform-tags = { path = "crates/platform-tags" }
pypi-types = { path = "crates/pypi-types" }
requirements-txt = { path = "crates/requirements-txt" }
uv = { path = "crates/uv" }
uv-auth = { path = "crates/uv-auth" }
uv-build = { path = "crates/uv-build" }
uv-cache = { path = "crates/uv-cache" }
uv-client = { path = "crates/uv-client" }
uv-dev = { path = "crates/uv-dev" }
uv-dispatch = { path = "crates/uv-dispatch" }
uv-distribution = { path = "crates/uv-distribution" }
uv-extract = { path = "crates/uv-extract" }
uv-fs = { path = "crates/uv-fs" }
uv-git = { path = "crates/uv-git" }
uv-installer = { path = "crates/uv-installer" }
uv-interpreter = { path = "crates/uv-interpreter" }
uv-normalize = { path = "crates/uv-normalize" }
uv-resolver = { path = "crates/uv-resolver" }
uv-traits = { path = "crates/uv-traits" }
uv-trampoline = { path = "crates/uv-trampoline" }
uv-version = { path = "crates/uv-version" }
uv-virtualenv = { path = "crates/uv-virtualenv" }
uv-warnings = { path = "crates/uv-warnings" }
anstream = { version = "0.6.13" } anstream = { version = "0.6.13" }
anyhow = { version = "1.0.80" } anyhow = { version = "1.0.80" }
async-channel = { version = "2.2.0" } async-channel = { version = "2.2.0" }

4
crates/bench/Cargo.toml
View file

@ -23,7 +23,7 @@ path = "benches/distribution_filename.rs"
harness = false harness = false
[dependencies] [dependencies]
distribution-filename = { path = "../distribution-filename" } distribution-filename = { workspace = true }
platform-tags = { path = "../platform-tags" } platform-tags = { workspace = true }
criterion = { version = "0.5.1", default-features = false } criterion = { version = "0.5.1", default-features = false }

6
crates/distribution-filename/Cargo.toml
View file

@ -16,9 +16,9 @@ workspace = true
rkyv = ["dep:rkyv", "pep440_rs/rkyv"] rkyv = ["dep:rkyv", "pep440_rs/rkyv"]
[dependencies] [dependencies]
pep440_rs = { path = "../pep440-rs" } pep440_rs = { workspace = true }
platform-tags = { path = "../platform-tags" } platform-tags = { workspace = true }
uv-normalize = { path = "../uv-normalize" } uv-normalize = { workspace = true }
rkyv = { workspace = true, features = ["strict", "validation"], optional = true } rkyv = { workspace = true, features = ["strict", "validation"], optional = true }
serde = { workspace = true, optional = true } serde = { workspace = true, optional = true }

18
crates/distribution-types/Cargo.toml
View file

@ -13,15 +13,15 @@ license = { workspace = true }
workspace = true workspace = true
[dependencies] [dependencies]
cache-key = { path = "../cache-key" } cache-key = { workspace = true }
distribution-filename = { path = "../distribution-filename", features = ["serde"] } distribution-filename = { workspace = true, features = ["serde"] }
pep440_rs = { path = "../pep440-rs" } pep440_rs = { workspace = true }
pep508_rs = { path = "../pep508-rs" } pep508_rs = { workspace = true }
platform-tags = { path = "../platform-tags" } platform-tags = { workspace = true }
uv-fs = { path = "../uv-fs" } uv-fs = { workspace = true }
uv-git = { path = "../uv-git", features = ["vendored-openssl"] } uv-git = { workspace = true, features = ["vendored-openssl"] }
uv-normalize = { path = "../uv-normalize" } uv-normalize = { workspace = true }
pypi-types = { path = "../pypi-types" } pypi-types = { workspace = true }
anyhow = { workspace = true } anyhow = { workspace = true }
fs-err = { workspace = true } fs-err = { workspace = true }

12
crates/install-wheel-rs/Cargo.toml
View file

@ -20,12 +20,12 @@ workspace = true
name = "install_wheel_rs" name = "install_wheel_rs"
[dependencies] [dependencies]
distribution-filename = { path = "../distribution-filename" } distribution-filename = { workspace = true }
pep440_rs = { path = "../pep440-rs" } pep440_rs = { workspace = true }
platform-tags = { path = "../platform-tags" } platform-tags = { workspace = true }
uv-normalize = { path = "../uv-normalize" } uv-normalize = { workspace = true }
uv-fs = { path = "../uv-fs" } uv-fs = { workspace = true }
pypi-types = { path = "../pypi-types" } pypi-types = { workspace = true }
clap = { workspace = true, optional = true, features = ["derive"] } clap = { workspace = true, optional = true, features = ["derive"] }
configparser = { workspace = true } configparser = { workspace = true }

6
crates/pep508-rs/Cargo.toml
View file

@ -17,9 +17,9 @@ name = "pep508_rs"
crate-type = ["cdylib", "rlib"] crate-type = ["cdylib", "rlib"]
[dependencies] [dependencies]
pep440_rs = { path = "../pep440-rs" } pep440_rs = { workspace = true }
uv-fs = { path = "../uv-fs" } uv-fs = { workspace = true }
uv-normalize = { path = "../uv-normalize" } uv-normalize = { workspace = true }
derivative = { workspace = true } derivative = { workspace = true }
once_cell = { workspace = true } once_cell = { workspace = true }

6
crates/pypi-types/Cargo.toml
View file

@ -13,9 +13,9 @@ license = { workspace = true }
workspace = true workspace = true
[dependencies] [dependencies]
pep440_rs = { path = "../pep440-rs", features = ["rkyv", "serde"] } pep440_rs = { workspace = true, features = ["rkyv", "serde"] }
pep508_rs = { path = "../pep508-rs", features = ["rkyv", "serde"] } pep508_rs = { workspace = true, features = ["rkyv", "serde"] }
uv-normalize = { path = "../uv-normalize" } uv-normalize = { workspace = true }
chrono = { workspace = true, features = ["serde"] } chrono = { workspace = true, features = ["serde"] }
mailparse = { workspace = true } mailparse = { workspace = true }

10
crates/requirements-txt/Cargo.toml
View file

@ -13,11 +13,11 @@ license = { workspace = true }
workspace = true workspace = true
[dependencies] [dependencies]
pep508_rs = { path = "../pep508-rs", features = ["rkyv", "serde", "non-pep508-extensions"] } pep508_rs = { workspace = true, features = ["rkyv", "serde", "non-pep508-extensions"] }
uv-client = { path = "../uv-client" } uv-client = { workspace = true }
uv-fs = { path = "../uv-fs" } uv-fs = { workspace = true }
uv-normalize = { path = "../uv-normalize" } uv-normalize = { workspace = true }
uv-warnings = { path = "../uv-warnings" } uv-warnings = { workspace = true }
async-recursion = { workspace = true } async-recursion = { workspace = true }
fs-err = { workspace = true } fs-err = { workspace = true }

14
crates/uv-build/Cargo.toml
View file

@ -14,13 +14,13 @@ license = { workspace = true }
workspace = true workspace = true
[dependencies] [dependencies]
distribution-types = { path = "../distribution-types" } distribution-types = { workspace = true }
pep440_rs = { path = "../pep440-rs" } pep440_rs = { workspace = true }
pep508_rs = { path = "../pep508-rs" } pep508_rs = { workspace = true }
uv-fs = { path = "../uv-fs" } uv-fs = { workspace = true }
uv-interpreter = { path = "../uv-interpreter" } uv-interpreter = { workspace = true }
uv-traits = { path = "../uv-traits", features = ["serde"] } uv-traits = { workspace = true, features = ["serde"] }
uv-virtualenv = { path = "../uv-virtualenv" } uv-virtualenv = { workspace = true }
anyhow = { workspace = true } anyhow = { workspace = true }
fs-err = { workspace = true } fs-err = { workspace = true }

8
crates/uv-cache/Cargo.toml
View file

@ -14,10 +14,10 @@ license = { workspace = true }
workspace = true workspace = true
[dependencies] [dependencies]
cache-key = { path = "../cache-key" } cache-key = { workspace = true }
distribution-types = { path = "../distribution-types" } distribution-types = { workspace = true }
uv-fs = { path = "../uv-fs" } uv-fs = { workspace = true }
uv-normalize = { path = "../uv-normalize" } uv-normalize = { workspace = true }
cachedir = { workspace = true } cachedir = { workspace = true }
clap = { workspace = true, features = ["derive", "env"], optional = true } clap = { workspace = true, features = ["derive", "env"], optional = true }

28
crates/uv-client/Cargo.toml
View file

@ -4,20 +4,20 @@ version = "0.0.1"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
cache-key = { path = "../cache-key" } cache-key = { workspace = true }
distribution-filename = { path = "../distribution-filename", features = ["rkyv", "serde"] } distribution-filename = { workspace = true, features = ["rkyv", "serde"] }
distribution-types = { path = "../distribution-types" } distribution-types = { workspace = true }
install-wheel-rs = { path = "../install-wheel-rs" } install-wheel-rs = { workspace = true }
pep440_rs = { path = "../pep440-rs" } pep440_rs = { workspace = true }
pep508_rs = { path = "../pep508-rs" } pep508_rs = { workspace = true }
platform-tags = { path = "../platform-tags" } platform-tags = { workspace = true }
uv-auth = { path = "../uv-auth" } uv-auth = { workspace = true }
uv-cache = { path = "../uv-cache" } uv-cache = { workspace = true }
uv-fs = { path = "../uv-fs", features = ["tokio"] } uv-fs = { workspace = true, features = ["tokio"] }
uv-normalize = { path = "../uv-normalize" } uv-normalize = { workspace = true }
uv-version = { path = "../uv-version" } uv-version = { workspace = true }
uv-warnings = { path = "../uv-warnings" } uv-warnings = { workspace = true }
pypi-types = { path = "../pypi-types" } pypi-types = { workspace = true }
anyhow = { workspace = true } anyhow = { workspace = true }
async-trait = { workspace = true } async-trait = { workspace = true }

32
crates/uv-dev/Cargo.toml
View file

@ -16,22 +16,22 @@ license = { workspace = true }
workspace = true workspace = true
[dependencies] [dependencies]
distribution-filename = { path = "../distribution-filename" } distribution-filename = { workspace = true }
distribution-types = { path = "../distribution-types" } distribution-types = { workspace = true }
install-wheel-rs = { path = "../install-wheel-rs" } install-wheel-rs = { workspace = true }
pep440_rs = { path = "../pep440-rs" } pep440_rs = { workspace = true }
pep508_rs = { path = "../pep508-rs" } pep508_rs = { workspace = true }
platform-tags = { path = "../platform-tags" } platform-tags = { workspace = true }
uv-build = { path = "../uv-build" } uv-build = { workspace = true }
uv-cache = { path = "../uv-cache", features = ["clap"] } uv-cache = { workspace = true, features = ["clap"] }
uv-client = { path = "../uv-client" } uv-client = { workspace = true }
uv-dispatch = { path = "../uv-dispatch" } uv-dispatch = { workspace = true }
uv-distribution = { path = "../uv-distribution" } uv-distribution = { workspace = true }
uv-installer = { path = "../uv-installer" } uv-installer = { workspace = true }
uv-interpreter = { path = "../uv-interpreter" } uv-interpreter = { workspace = true }
uv-normalize = { path = "../uv-normalize" } uv-normalize = { workspace = true }
uv-resolver = { path = "../uv-resolver" } uv-resolver = { workspace = true }
uv-traits = { path = "../uv-traits" } uv-traits = { workspace = true }
# Any dependencies that are exclusively used in `uv-dev` should be listed as non-workspace # Any dependencies that are exclusively used in `uv-dev` should be listed as non-workspace
# dependencies, to ensure that we're forced to think twice before including them in other crates. # dependencies, to ensure that we're forced to think twice before including them in other crates.

18
crates/uv-dispatch/Cargo.toml
View file

@ -14,15 +14,15 @@ license = { workspace = true }
workspace = true workspace = true
[dependencies] [dependencies]
distribution-types = { path = "../distribution-types" } distribution-types = { workspace = true }
pep508_rs = { path = "../pep508-rs" } pep508_rs = { workspace = true }
uv-build = { path = "../uv-build" } uv-build = { workspace = true }
uv-cache = { path = "../uv-cache" } uv-cache = { workspace = true }
uv-client = { path = "../uv-client" } uv-client = { workspace = true }
uv-installer = { path = "../uv-installer" } uv-installer = { workspace = true }
uv-interpreter = { path = "../uv-interpreter" } uv-interpreter = { workspace = true }
uv-resolver = { path = "../uv-resolver" } uv-resolver = { workspace = true }
uv-traits = { path = "../uv-traits" } uv-traits = { workspace = true }
anyhow = { workspace = true } anyhow = { workspace = true }
futures = { workspace = true } futures = { workspace = true }

30
crates/uv-distribution/Cargo.toml
View file

@ -13,21 +13,21 @@ license = { workspace = true }
workspace = true workspace = true
[dependencies] [dependencies]
cache-key = { path = "../cache-key" } cache-key = { workspace = true }
distribution-filename = { path = "../distribution-filename", features = ["serde"] } distribution-filename = { workspace = true, features = ["serde"] }
distribution-types = { path = "../distribution-types" } distribution-types = { workspace = true }
install-wheel-rs = { path = "../install-wheel-rs" } install-wheel-rs = { workspace = true }
pep440_rs = { path = "../pep440-rs" } pep440_rs = { workspace = true }
pep508_rs = { path = "../pep508-rs" } pep508_rs = { workspace = true }
platform-tags = { path = "../platform-tags" } platform-tags = { workspace = true }
uv-cache = { path = "../uv-cache" } uv-cache = { workspace = true }
uv-client = { path = "../uv-client" } uv-client = { workspace = true }
uv-extract = { path = "../uv-extract" } uv-extract = { workspace = true }
uv-fs = { path = "../uv-fs", features = ["tokio"] } uv-fs = { workspace = true, features = ["tokio"] }
uv-git = { path = "../uv-git", features = ["vendored-openssl"] } uv-git = { workspace = true, features = ["vendored-openssl"] }
uv-normalize = { path = "../uv-normalize" } uv-normalize = { workspace = true }
uv-traits = { path = "../uv-traits" } uv-traits = { workspace = true }
pypi-types = { path = "../pypi-types" } pypi-types = { workspace = true }
anyhow = { workspace = true } anyhow = { workspace = true }
fs-err = { workspace = true } fs-err = { workspace = true }

2
crates/uv-fs/Cargo.toml
View file

@ -13,7 +13,7 @@ license = { workspace = true }
workspace = true workspace = true
[dependencies] [dependencies]
uv-warnings = { path = "../uv-warnings" } uv-warnings = { workspace = true }
backoff = { workspace = true } backoff = { workspace = true }
dunce = { workspace = true } dunce = { workspace = true }

4
crates/uv-git/Cargo.toml
View file

@ -13,8 +13,8 @@ license = { workspace = true }
workspace = true workspace = true
[dependencies] [dependencies]
cache-key = { path = "../cache-key" } cache-key = { workspace = true }
uv-fs = { path = "../uv-fs" } uv-fs = { workspace = true }
anyhow = { workspace = true } anyhow = { workspace = true }
base64 = { workspace = true } base64 = { workspace = true }

32
crates/uv-installer/Cargo.toml
View file

@ -13,22 +13,22 @@ license = { workspace = true }
workspace = true workspace = true
[dependencies] [dependencies]
distribution-types = { path = "../distribution-types" } distribution-types = { workspace = true }
install-wheel-rs = { path = "../install-wheel-rs", default-features = false } install-wheel-rs = { workspace = true, default-features = false }
pep440_rs = { path = "../pep440-rs" } pep440_rs = { workspace = true }
pep508_rs = { path = "../pep508-rs" } pep508_rs = { workspace = true }
platform-tags = { path = "../platform-tags" } platform-tags = { workspace = true }
pypi-types = { path = "../pypi-types" } pypi-types = { workspace = true }
requirements-txt = { path = "../requirements-txt" } requirements-txt = { workspace = true }
uv-cache = { path = "../uv-cache" } uv-cache = { workspace = true }
uv-client = { path = "../uv-client" } uv-client = { workspace = true }
uv-distribution = { path = "../uv-distribution" } uv-distribution = { workspace = true }
uv-extract = { path = "../uv-extract" } uv-extract = { workspace = true }
uv-fs = { path = "../uv-fs" } uv-fs = { workspace = true }
uv-interpreter = { path = "../uv-interpreter" } uv-interpreter = { workspace = true }
uv-normalize = { path = "../uv-normalize" } uv-normalize = { workspace = true }
uv-traits = { path = "../uv-traits" } uv-traits = { workspace = true }
uv-warnings = { path = "../uv-warnings" } uv-warnings = { workspace = true }
anyhow = { workspace = true } anyhow = { workspace = true }
async-channel = { workspace = true } async-channel = { workspace = true }

16
crates/uv-interpreter/Cargo.toml
View file

@ -13,14 +13,14 @@ license = { workspace = true }
workspace = true workspace = true
[dependencies] [dependencies]
cache-key = { path = "../cache-key" } cache-key = { workspace = true }
install-wheel-rs = { path = "../install-wheel-rs" } install-wheel-rs = { workspace = true }
pep440_rs = { path = "../pep440-rs" } pep440_rs = { workspace = true }
pep508_rs = { path = "../pep508-rs", features = ["serde"] } pep508_rs = { workspace = true, features = ["serde"] }
platform-tags = { path = "../platform-tags" } platform-tags = { workspace = true }
pypi-types = { path = "../pypi-types" } pypi-types = { workspace = true }
uv-cache = { path = "../uv-cache" } uv-cache = { workspace = true }
uv-fs = { path = "../uv-fs" } uv-fs = { workspace = true }
configparser = { workspace = true } configparser = { workspace = true }
fs-err = { workspace = true, features = ["tokio"] } fs-err = { workspace = true, features = ["tokio"] }

34
crates/uv-resolver/Cargo.toml
View file

@ -13,22 +13,22 @@ license = { workspace = true }
workspace = true workspace = true
[dependencies] [dependencies]
cache-key = { path = "../cache-key" } cache-key = { workspace = true }
distribution-filename = { path = "../distribution-filename", features = ["serde"] } distribution-filename = { workspace = true, features = ["serde"] }
distribution-types = { path = "../distribution-types" } distribution-types = { workspace = true }
once-map = { path = "../once-map" } once-map = { workspace = true }
pep440_rs = { path = "../pep440-rs", features = ["pubgrub"] } pep440_rs = { workspace = true, features = ["pubgrub"] }
pep508_rs = { path = "../pep508-rs" } pep508_rs = { workspace = true }
platform-tags = { path = "../platform-tags" } platform-tags = { workspace = true }
pypi-types = { path = "../pypi-types" } pypi-types = { workspace = true }
requirements-txt = { path = "../requirements-txt" } requirements-txt = { workspace = true }
uv-cache = { path = "../uv-cache" } uv-cache = { workspace = true }
uv-client = { path = "../uv-client" } uv-client = { workspace = true }
uv-distribution = { path = "../uv-distribution" } uv-distribution = { workspace = true }
uv-interpreter = { path = "../uv-interpreter" } uv-interpreter = { workspace = true }
uv-normalize = { path = "../uv-normalize" } uv-normalize = { workspace = true }
uv-traits = { path = "../uv-traits" } uv-traits = { workspace = true }
uv-warnings = { path = "../uv-warnings" } uv-warnings = { workspace = true }
anstream = { workspace = true } anstream = { workspace = true }
anyhow = { workspace = true } anyhow = { workspace = true }
@ -53,7 +53,7 @@ tracing = { workspace = true }
url = { workspace = true } url = { workspace = true }
[dev-dependencies] [dev-dependencies]
uv-interpreter = { path = "../uv-interpreter" } uv-interpreter = { workspace = true }
once_cell = { version = "1.19.0" } once_cell = { version = "1.19.0" }
insta = { version = "1.36.1" } insta = { version = "1.36.1" }

12
crates/uv-traits/Cargo.toml
View file

@ -13,12 +13,12 @@ license = { workspace = true }
workspace = true workspace = true
[dependencies] [dependencies]
distribution-types = { path = "../distribution-types" } distribution-types = { workspace = true }
once-map = { path = "../once-map" } once-map = { workspace = true }
pep508_rs = { path = "../pep508-rs" } pep508_rs = { workspace = true }
uv-cache = { path = "../uv-cache" } uv-cache = { workspace = true }
uv-interpreter = { path = "../uv-interpreter" } uv-interpreter = { workspace = true }
uv-normalize = { path = "../uv-normalize" } uv-normalize = { workspace = true }
anyhow = { workspace = true } anyhow = { workspace = true }
serde = { workspace = true, optional = true } serde = { workspace = true, optional = true }

10
crates/uv-virtualenv/Cargo.toml
View file

@ -21,11 +21,11 @@ required-features = ["cli"]
workspace = true workspace = true
[dependencies] [dependencies]
platform-tags = { path = "../platform-tags" } platform-tags = { workspace = true }
pypi-types = { path = "../pypi-types" } pypi-types = { workspace = true }
uv-cache = { path = "../uv-cache" } uv-cache = { workspace = true }
uv-fs = { path = "../uv-fs" } uv-fs = { workspace = true }
uv-interpreter = { path = "../uv-interpreter" } uv-interpreter = { workspace = true }
anstream = { workspace = true } anstream = { workspace = true }
cachedir = { workspace = true } cachedir = { workspace = true }

36
crates/uv/Cargo.toml
View file

@ -14,24 +14,24 @@ default-run = "uv"
workspace = true workspace = true
[dependencies] [dependencies]
distribution-types = { path = "../distribution-types" } distribution-types = { workspace = true }
install-wheel-rs = { path = "../install-wheel-rs", features = ["clap"], default-features = false } install-wheel-rs = { workspace = true, features = ["clap"], default-features = false }
pep508_rs = { path = "../pep508-rs" } pep508_rs = { workspace = true }
platform-tags = { path = "../platform-tags" } platform-tags = { workspace = true }
pypi-types = { path = "../pypi-types" } pypi-types = { workspace = true }
requirements-txt = { path = "../requirements-txt", features = ["reqwest"] } requirements-txt = { workspace = true, features = ["reqwest"] }
uv-auth = { path = "../uv-auth", features = ["clap"] } uv-auth = { workspace = true, features = ["clap"] }
uv-cache = { path = "../uv-cache", features = ["clap"] } uv-cache = { workspace = true, features = ["clap"] }
uv-client = { path = "../uv-client" } uv-client = { workspace = true }
uv-dispatch = { path = "../uv-dispatch" } uv-dispatch = { workspace = true }
uv-fs = { path = "../uv-fs" } uv-fs = { workspace = true }
uv-installer = { path = "../uv-installer" } uv-installer = { workspace = true }
uv-interpreter = { path = "../uv-interpreter" } uv-interpreter = { workspace = true }
uv-normalize = { path = "../uv-normalize" } uv-normalize = { workspace = true }
uv-resolver = { path = "../uv-resolver", features = ["clap"] } uv-resolver = { workspace = true, features = ["clap"] }
uv-traits = { path = "../uv-traits" } uv-traits = { workspace = true }
uv-virtualenv = { path = "../uv-virtualenv" } uv-virtualenv = { workspace = true }
uv-warnings = { path = "../uv-warnings" } uv-warnings = { workspace = true }
anstream = { workspace = true } anstream = { workspace = true }
anyhow = { workspace = true } anyhow = { workspace = true }