Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: switch from rip to uv #863

Merged
merged 71 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
f82fbd0
refactor: uv
baszalmstra Feb 19, 2024
2974cd4
refactor: resolve should work :shrug:
baszalmstra Feb 19, 2024
be5cb9b
fix: use git reference for all rattler
baszalmstra Feb 19, 2024
6f0694d
refactor: rip removal
baszalmstra Feb 19, 2024
1c1a8db
refactor: more rip removal
baszalmstra Feb 19, 2024
197e52d
refactor: more rip removal
baszalmstra Feb 19, 2024
e258a0b
wip: installing subroutine created
tdejager Feb 19, 2024
5ae69e9
wip: converting to new types
tdejager Feb 19, 2024
2ba9f53
fix: more error
baszalmstra Feb 19, 2024
2f2ae23
fix: python.rs errors
tdejager Feb 19, 2024
ab9c591
fix: more errors
baszalmstra Feb 19, 2024
2855392
wip: its compiling
tdejager Feb 19, 2024
d47c4ed
feat: some compile time fixes
tdejager Feb 20, 2024
d4a58c6
fix: whitespace
tdejager Feb 20, 2024
6759bc4
fix: more errors
baszalmstra Feb 20, 2024
717f2e4
wip: sdist support
tdejager Feb 20, 2024
9d78f7f
feat: simple progress report for resolving
tdejager Feb 20, 2024
77a9e2c
feat: venv fix
tdejager Feb 20, 2024
fee39fe
fix: small fix
tdejager Feb 20, 2024
0b185c5
feat: share between resolvers
baszalmstra Feb 20, 2024
c336e98
feat: share resources between solve and install
baszalmstra Feb 20, 2024
85cd8d1
fix: cargo imports
tdejager Feb 20, 2024
6bb949d
feat: for tim
baszalmstra Feb 20, 2024
ceecfc4
fix: dont check extras in the lock-file
baszalmstra Feb 20, 2024
37dad70
fix: constrain the locked versions
baszalmstra Feb 20, 2024
0a78d05
bump: uv to 0.1.6
baszalmstra Feb 22, 2024
7f242d9
bump: uv to 0.1.7
baszalmstra Feb 22, 2024
247390f
wip: using own installation
tdejager Feb 22, 2024
1730c5d
fix: small bug with preliminary installing
tdejager Feb 22, 2024
db02a99
fix: try to fix cargo toml
tdejager Feb 22, 2024
846cd97
fix: conda packages are taken from conda
baszalmstra Feb 22, 2024
e7dad83
fix: Cargo.toml again
tdejager Feb 22, 2024
adbb0ed
fix: correct pixi.toml for example
baszalmstra Feb 22, 2024
bd605f9
bump: uv to 0.1.8
baszalmstra Feb 22, 2024
d90d604
Merge branch 'refactor/uv' of github.com:baszalmstra/pixi into refact…
baszalmstra Feb 22, 2024
447d057
wip: correctly install sdist
tdejager Feb 22, 2024
96539e6
fix: use correct filename for install
tdejager Feb 23, 2024
e3760f6
fix: does not re-install when not needed
tdejager Feb 23, 2024
2885f43
wip: progress
tdejager Feb 23, 2024
a90bd3f
fix: dist finder
baszalmstra Feb 23, 2024
4a1a8c5
feat: change the way progress is displayed
tdejager Feb 26, 2024
33a21fc
fix: clippy
tdejager Feb 26, 2024
e6d7387
fix: lock
tdejager Feb 26, 2024
236061e
Merge branch 'main' into refactor/uv
tdejager Feb 26, 2024
8267001
feat: update example
tdejager Feb 26, 2024
55e8069
fix: snapshot tests
tdejager Feb 26, 2024
5f128e4
fix: fix first test
tdejager Feb 26, 2024
e6be1b4
Merge branch 'main' into refactor/uv
ruben-arts Feb 27, 2024
2dc9753
feat: chance cache directory
tdejager Feb 27, 2024
6d70a08
feat: debugging and show version when building
tdejager Feb 27, 2024
5ce9889
fix: remove unused code
tdejager Feb 27, 2024
5520a85
fix: typo in pypi solve
ruben-arts Feb 27, 2024
cb24d28
Merge branch 'main' into refactor/uv
tdejager Feb 27, 2024
1bb13c8
feat: use my own branch for testing
tdejager Feb 28, 2024
a3db62a
feat: use modified branch with environment variable passing
tdejager Feb 28, 2024
77b7ea6
fix: serialization of pypi requirement
ruben-arts Feb 28, 2024
360ba3b
fix: more snapshot updates
tdejager Feb 28, 2024
7c10832
lint: fix typo
ruben-arts Feb 28, 2024
e647fbc
refactor: use PyPiPackageName to wrap uv_normalized::PackageName for …
ruben-arts Feb 28, 2024
a6e248f
Merge pull request #1 from ruben-arts/fix/wrap_uv_normalized_name_in_…
tdejager Feb 29, 2024
9873e84
Merge branch 'main' into refactor/uv
tdejager Feb 29, 2024
14296ea
feat: made a simple python interpreter check
tdejager Feb 29, 2024
0d7932a
feat: use new uv version
tdejager Feb 29, 2024
9c571bc
Update src/lock_file/update.rs
tdejager Feb 29, 2024
6dfc0eb
Merge branch 'main' into refactor/uv
tdejager Feb 29, 2024
dd53a1f
feat: update to new uv
tdejager Feb 29, 2024
5d4efbb
feat: updated to new versions of uv and rattler
tdejager Feb 29, 2024
55146a1
bump: to latest rattler main
baszalmstra Feb 29, 2024
5d9453e
fix: pre-commit issue
baszalmstra Feb 29, 2024
7243eaa
fix: arm64 in tags
baszalmstra Mar 1, 2024
46c9bf0
fix: broken build
baszalmstra Mar 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,842 changes: 1,350 additions & 492 deletions Cargo.lock

Large diffs are not rendered by default.

133 changes: 106 additions & 27 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,43 @@ readme = "README.md"

[features]
default = ["native-tls"]
native-tls = ["reqwest/native-tls", "rattler_repodata_gateway/native-tls", "rattler/native-tls", "rip/native-tls"]
rustls-tls = ["reqwest/rustls-tls", "reqwest/rustls-tls-native-roots", "rattler_repodata_gateway/rustls-tls", "rattler/rustls-tls", "rip/rustls-tls"]
native-tls = [
"reqwest/native-tls",
"rattler_repodata_gateway/native-tls",
"rattler/native-tls",
]
rustls-tls = [
"reqwest/rustls-tls",
"reqwest/rustls-tls-native-roots",
"rattler_repodata_gateway/rustls-tls",
"rattler/rustls-tls",
]
slow_integration_tests = []

[dependencies]
assert_matches = "1.5.0"
async-once-cell = "0.5.3"
async-recursion = "1.0.5"
async-scoped = { version = "0.9.0", features = ["use-tokio"] }
cfg-if = "0.1"
chrono = "0.4.34"
clap = { version = "4.5.1", default-features = false, features = ["derive", "usage", "wrap_help", "std", "color", "error-context", "env"] }
clap = { version = "4.5.1", default-features = false, features = [
"derive",
"usage",
"wrap_help",
"std",
"color",
"error-context",
"env",
] }
clap-verbosity-flag = "2.2.0"
clap_complete = "4.5.1"
console = { version = "0.15.8", features = ["windows-console-colors"] }
deno_task_shell = "0.14.4"
dialoguer = "0.11.0"
dirs = "5.0.1"
distribution-filename = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
distribution-types = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
dunce = "1.0.4"
flate2 = "1.0.28"
futures = "0.3.30"
Expand All @@ -37,28 +57,45 @@ humantime = "2.1.0"
indexmap = { version = "2.2.4", features = ["serde"] }
indicatif = "0.17.8"
insta = { version = "1.35.1", features = ["yaml"] }

install-wheel-rs = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
is_executable = "1.0.1"
itertools = "0.12.1"
lazy_static = "1.4.0"
miette = { version = "7.1.0", features = ["fancy", "supports-color", "supports-hyperlinks", "supports-unicode", "terminal_size", "textwrap"] }
miette = { version = "7.1.0", features = [
"fancy",
"supports-color",
"supports-hyperlinks",
"supports-unicode",
"terminal_size",
"textwrap",
] }
minijinja = { version = "1.0.12", features = ["builtins"] }
once_cell = "1.19.0"
pep440_rs = "0.4.0"
pep508_rs = { version = "0.3.0", features = ["modern"] }
pep440_rs = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
pep508_rs = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
platform-host = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
platform-tags = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
pypi-types = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
rattler = { version = "0.19.0", default-features = false }
rattler_conda_types = { version = "0.19.0", default-features = false }
rattler_digest = { version = "0.19.0", default-features = false }
rattler_lock = { version = "0.19.0", default-features = false }
rattler_networking = { version = "0.19.0", default-features = false }
rattler_repodata_gateway = { version = "0.19.0", default-features = false, features = ["sparse"] }
rattler_shell = { version = "0.19.0", default-features = false, features = ["sysinfo"] }
rattler_solve = { version = "0.19.0", default-features = false, features = ["resolvo"] }
rattler_repodata_gateway = { version = "0.19.0", default-features = false, features = [
"sparse",
] }
rattler_shell = { version = "0.19.0", default-features = false, features = [
"sysinfo",
] }
rattler_solve = { version = "0.19.0", default-features = false, features = [
"resolvo",
] }
rattler_virtual_packages = { version = "0.19.0", default-features = false }
regex = "1.10.3"
reqwest = { version = "0.11.24", default-features = false }
reqwest-middleware = "0.2.4"
reqwest-retry = "0.3.0"
rip = { package = "rattler_installs_packages", version = "0.8.1", default-features = false }
self-replace = "1.3.7"
serde = "1.0.197"
serde-untagged = "0.1.5"
Expand All @@ -73,16 +110,37 @@ tabwriter = { version = "1.4.0", features = ["ansi_formatting"] }
tar = "0.4.40"
tempfile = "3.10.1"
thiserror = "1.0.57"
tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread", "signal"] }
tokio = { version = "1.36.0", features = [
"macros",
"rt-multi-thread",
"signal",
] }
tokio-util = "0.7.10"
toml_edit = { version = "0.22.6", features = ["serde"] }
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
url = "2.5.0"
zip = { version = "0.6.6", default-features = false, features = ["deflate", "time"] }
uv-cache = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
uv-client = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
uv-dispatch = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
uv-distribution = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
uv-installer = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
uv-interpreter = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
uv-normalize = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
uv-resolver = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
uv-traits = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
zip = { version = "0.6.6", default-features = false, features = [
"deflate",
"time",
] }

[target.'cfg(unix)'.dependencies]
nix = { version = "0.28.0", default-features = false, features = ["fs", "signal", "term", "poll"] }
nix = { version = "0.28.0", default-features = false, features = [
"fs",
"signal",
"term",
"poll",
] }
libc = { version = "0.2.153", default-features = false }
signal-hook = "0.3.17"

Expand All @@ -95,20 +153,21 @@ tokio = { version = "1.36.0", features = ["rt"] }
toml = "0.8.10"

[patch.crates-io]
#rattler = { git = "https://github.com/mamba-org/rattler", branch = "main" }
#rattler_conda_types = { git = "https://github.com/mamba-org/rattler", branch = "main" }
#rattler_digest = { git = "https://github.com/mamba-org/rattler", branch = "main" }
#rattler_lock = { git = "https://github.com/mamba-org/rattler", branch = "main" }
#rattler_networking = { git = "https://github.com/mamba-org/rattler", branch = "main" }
#rattler_repodata_gateway = { git = "https://github.com/mamba-org/rattler", branch = "main" }
#rattler_shell = { git = "https://github.com/mamba-org/rattler", branch = "main" }
#rattler_solve = { git = "https://github.com/mamba-org/rattler", branch = "main" }
#rattler_virtual_packages = { git = "https://github.com/mamba-org/rattler", branch = "main" }
#rip = { package = "rattler_installs_packages", git = "https://github.com/prefix-dev/rattler_installs_packages", branch = "main"}
#resolvo = { git = "https://github.com/mamba-org/resolvo.git", branch = "main" }
#deno_task_shell = { path = "../deno_task_shell" }
# For pyproject-toml
# If you change this also change the versions in the the patch section for astral
pep440_rs = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
pep508_rs = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }

#rattler = { path = "../rattler/crates/rattler" }
rattler = { git = "https://github.com/mamba-org/rattler", rev = "7e0a130f0603fc2ff204649df9adba78422de2c8" }
rattler_conda_types = { git = "https://github.com/mamba-org/rattler", rev = "7e0a130f0603fc2ff204649df9adba78422de2c8" }
rattler_digest = { git = "https://github.com/mamba-org/rattler", rev = "7e0a130f0603fc2ff204649df9adba78422de2c8" }
rattler_lock = { git = "https://github.com/mamba-org/rattler", rev = "7e0a130f0603fc2ff204649df9adba78422de2c8" }
rattler_networking = { git = "https://github.com/mamba-org/rattler", rev = "7e0a130f0603fc2ff204649df9adba78422de2c8" }
rattler_repodata_gateway = { git = "https://github.com/mamba-org/rattler", rev = "7e0a130f0603fc2ff204649df9adba78422de2c8" }
rattler_shell = { git = "https://github.com/mamba-org/rattler", rev = "7e0a130f0603fc2ff204649df9adba78422de2c8" }
rattler_solve = { git = "https://github.com/mamba-org/rattler", rev = "7e0a130f0603fc2ff204649df9adba78422de2c8" }
rattler_virtual_packages = { git = "https://github.com/mamba-org/rattler", rev = "7e0a130f0603fc2ff204649df9adba78422de2c8" }
#deno_task_shell = { path = "../deno_task_shell" }#rattler = { path = "../rattler/crates/rattler" }
#rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" }
#rattler_digest = { path = "../rattler/crates/rattler_digest" }
#rattler_networking = { path = "../rattler/crates/rattler_networking" }
Expand All @@ -117,4 +176,24 @@ toml = "0.8.10"
#rattler_solve = { path = "../rattler/crates/rattler_solve" }
#rattler_virtual_packages = { path = "../rattler/crates/rattler_virtual_packages" }
#rattler_lock = { path = "../rattler/crates/rattler_lock" }
#rip = { package = "rattler_installs_packages", path = "../rip" }


# Change these lines if you want a patched version of astral
# [patch.'https://github.com/astral-sh/uv']
# pep440_rs = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
# pep508_rs = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
# uv-cache = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
# uv-client = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
# uv-dispatch = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
# uv-distribution = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
# uv-installer = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
# uv-interpreter = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
# uv-normalize = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
# uv-resolver = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
# uv-traits = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
# distribution-filename = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
# distribution-types = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
# install-wheel-rs = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
# platform-host = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
# platform-tags = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
# pypi-types = { git = "https://github.com/astral-sh/uv", rev = "9a99aa777618c55d21a9376699a2aeb646501bd6" }
Loading
Loading