Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ab6e8bb
feat: global sync shortcuts
Hofer-Julian Feb 27, 2025
305b6f2
Add shortcuts serialization
Hofer-Julian Feb 27, 2025
ec6a12f
Update to latest rattler version
Hofer-Julian Feb 27, 2025
b7f33af
Continue
Hofer-Julian Feb 27, 2025
5d0fd07
First working version
Hofer-Julian Feb 27, 2025
c9f2cf7
Re-evaluate when needed
Hofer-Julian Feb 27, 2025
d78ee90
Remove unneeded method
Hofer-Julian Feb 27, 2025
9f01f4a
Add snapshot
Hofer-Julian Feb 27, 2025
d39695c
Update snapshot
Hofer-Julian Feb 28, 2025
3f34926
Continue
Hofer-Julian Feb 28, 2025
a91a525
Clean up `pixi global install`
Hofer-Julian Feb 28, 2025
e0c1252
test: make shotcut test cross platforms, wip need to test on other pl…
ruben-arts Feb 28, 2025
7c0c509
test: fix linux and win key
ruben-arts Feb 28, 2025
cc10fd5
Add support for `pixi global install`
Hofer-Julian Feb 28, 2025
3c68ad5
Add test for `pixi global install`
Hofer-Julian Feb 28, 2025
0476eb5
Add test for `--no-shortcut`
Hofer-Julian Feb 28, 2025
b495eec
Assume system implicitly
Hofer-Julian Feb 28, 2025
fe0cfff
Use factory pattern
Hofer-Julian Feb 28, 2025
026dd0c
Fix migration test
Hofer-Julian Feb 28, 2025
b82f247
Pre-commit
Hofer-Julian Feb 28, 2025
342669d
Remove unneded methods
Hofer-Julian Feb 28, 2025
7ca43f0
Improve test setup
Hofer-Julian Feb 28, 2025
b7a78e4
Test duplicated shortcuts
Hofer-Julian Feb 28, 2025
8583e87
Fix behavior when removing environments
Hofer-Julian Feb 28, 2025
1706628
Add more test for `test_sync_unavailable_shortcuts`
Hofer-Julian Mar 3, 2025
e260227
Add flags to CLI docs
Hofer-Julian Mar 3, 2025
04d9e8f
test: fix windows tests but still have to wait for some changes in ra…
ruben-arts Mar 3, 2025
5fef81e
Add tutorial for shortcuts
Hofer-Julian Mar 3, 2025
b549d5c
test: win multiple paths
ruben-arts Mar 4, 2025
e14ff98
Update rattler
Hofer-Julian Mar 5, 2025
4d39973
Merge branch 'main' into feat/global-sync-shortcuts
Hofer-Julian Mar 5, 2025
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
132 changes: 49 additions & 83 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -116,19 +116,20 @@ which = "7.0.2"

# Rattler crates
file_url = "0.2.3"
rattler = { version = "0.32.3", default-features = false }
rattler_cache = { version = "0.3.12", default-features = false }
rattler_conda_types = { version = "0.31.2", default-features = false, features = [
rattler = { version = "0.32.4", default-features = false }
rattler_cache = { version = "0.3.13", default-features = false }
rattler_conda_types = { version = "0.31.3", default-features = false, features = [
"rayon",
] }
rattler_digest = { version = "1.0.7", default-features = false }
rattler_lock = { version = "0.22.46", default-features = false }
rattler_networking = { version = "0.22.7", default-features = false, features = [
rattler_menuinst = { version = "0.2.2", default-features = false }
rattler_networking = { version = "0.22.8", default-features = false, features = [
"google-cloud-auth",
] }
rattler_repodata_gateway = { version = "0.21.40", default-features = false }
rattler_repodata_gateway = { version = "0.22.0", default-features = false }
rattler_shell = { version = "0.22.22", default-features = false }
rattler_solve = { version = "1.3.11", default-features = false }
rattler_solve = { version = "1.4.0", default-features = false }
rattler_virtual_packages = { version = "2.0.6", default-features = false }


Expand Down Expand Up @@ -264,6 +265,7 @@ rattler = { workspace = true, features = ["cli-tools", "indicatif"] }
rattler_conda_types = { workspace = true }
rattler_digest = { workspace = true }
rattler_lock = { workspace = true }
rattler_menuinst = { workspace = true }
rattler_networking = { workspace = true }
rattler_repodata_gateway = { workspace = true, features = [
"sparse",
Expand Down
1 change: 1 addition & 0 deletions crates/pixi_consts/src/consts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ pub const CONDA_PACKAGE_CACHE_DIR: &str = rattler_cache::PACKAGE_CACHE_DIR;
pub const CONDA_REPODATA_CACHE_DIR: &str = rattler_cache::REPODATA_CACHE_DIR;
// TODO: move to rattler
pub const CONDA_META_DIR: &str = "conda-meta";
pub const CONDA_MENU_SCHEMA_DIR: &str = "Menu";
pub const PYPI_CACHE_DIR: &str = "uv-cache";
pub const CONDA_PYPI_MAPPING_CACHE_DIR: &str = "conda-pypi-mapping";
pub const CACHED_ENVS_DIR: &str = "cached-envs-v0";
Expand Down
1 change: 1 addition & 0 deletions crates/pixi_toml/src/from_str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use crate::DeserializeAs;
/// additional parsing beyond checking if the value is a string. If a type
/// provides a [`FromStr`] implementation, this type can be used to deserialize
/// the value and return the parsed value.
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct TomlFromStr<T>(T);

impl<T> TomlFromStr<T> {
Expand Down
Loading
Loading