-
Notifications
You must be signed in to change notification settings - Fork 186
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feat/uv-0.2.6
- Loading branch information
Showing
75 changed files
with
7,341 additions
and
1,099 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
pixi.lock linguist-language=YAML | ||
pixi.lock linguist-language=YAML linguist-generated=true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,8 +3,8 @@ | |
.vscode | ||
.test-projects | ||
__pycache__ | ||
**/**/.pixi | ||
**/**/.build | ||
.pixi | ||
.build | ||
.DS_store | ||
site/ | ||
.cache |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,8 +24,8 @@ authors: | |
name-particle: de | ||
family-names: Jager | ||
email: [email protected] | ||
repository-code: 'https://github.com/prefix-dev/pixi/releases/tag/v0.23.0' | ||
url: 'https://pixi.sh/v0.23.0' | ||
repository-code: 'https://github.com/prefix-dev/pixi/releases/tag/v0.24.2' | ||
url: 'https://pixi.sh/v0.24.2' | ||
abstract: >- | ||
A cross-platform, language agnostic, package/project | ||
management tool for development in virtual environments. | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[package] | ||
name = "pixi" | ||
version = "0.23.0" | ||
version = "0.24.2" | ||
description = "A package management and workflow tool" | ||
edition = "2021" | ||
authors = ["pixi contributors <[email protected]>"] | ||
|
@@ -42,6 +42,7 @@ clap = { version = "4.5.4", default-features = false, features = [ | |
] } | ||
clap-verbosity-flag = "2.2.0" | ||
clap_complete = "4.5.2" | ||
concat-idents = "1.1.5" | ||
console = { version = "0.15.8", features = ["windows-console-colors"] } | ||
crossbeam-channel = "0.5.12" | ||
csv = "1.3.0" | ||
|
@@ -52,6 +53,7 @@ distribution-filename = { git = "https://github.com/astral-sh/uv", tag = "0.2.11 | |
distribution-types = { git = "https://github.com/astral-sh/uv", tag = "0.2.11" } | ||
dunce = "1.0.4" | ||
flate2 = "1.0.28" | ||
fs_extra = "1.3.0" | ||
futures = "0.3.30" | ||
http-cache-reqwest = "0.14.0" | ||
human_bytes = "0.4.3" | ||
|
@@ -74,18 +76,19 @@ miette = { version = "7.2.0", features = [ | |
minijinja = { version = "1.0.20", features = ["builtins"] } | ||
once_cell = "1.19.0" | ||
parking_lot = "0.12.2" | ||
percent-encoding = "2.3.1" | ||
pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.2.11" } | ||
pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.2.11" } | ||
platform-tags = { git = "https://github.com/astral-sh/uv", tag = "0.2.11" } | ||
pypi-types = { git = "https://github.com/astral-sh/uv", tag = "0.2.11" } | ||
pyproject-toml = "0.11.0" | ||
rattler = { version = "0.26.1", default-features = false, features = [ | ||
rattler = { version = "0.26.4", default-features = false, features = [ | ||
"cli-tools", | ||
"indicatif", | ||
] } | ||
rattler_conda_types = { version = "0.25.0", default-features = false } | ||
rattler_conda_types = { version = "0.25.2", default-features = false } | ||
rattler_digest = { version = "0.19.4", default-features = false } | ||
rattler_lock = { version = "0.22.9", default-features = false } | ||
rattler_lock = { version = "0.22.12", default-features = false } | ||
rattler_networking = { version = "0.20.8", default-features = false } | ||
rattler_repodata_gateway = { version = "0.20.3", default-features = false, features = [ | ||
"sparse", | ||
|
@@ -94,7 +97,7 @@ rattler_repodata_gateway = { version = "0.20.3", default-features = false, featu | |
rattler_shell = { version = "0.20.6", default-features = false, features = [ | ||
"sysinfo", | ||
] } | ||
rattler_solve = { version = "0.23.2", default-features = false, features = [ | ||
rattler_solve = { version = "0.24.2", default-features = false, features = [ | ||
"resolvo", | ||
] } | ||
|
||
|
@@ -194,16 +197,16 @@ pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.2.11" } | |
#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" } | ||
# rattler_conda_types = { path = "../rattler-1/crates/rattler_conda_types" } | ||
# rattler_digest = { path = "../rattler-1/crates/rattler_digest" } | ||
# rattler_networking = { path = "../rattler-1/crates/rattler_networking" } | ||
# rattler_repodata_gateway = { path = "../rattler-1/crates/rattler_repodata_gateway" } | ||
# rattler_shell = { path = "../rattler-1/crates/rattler_shell" } | ||
# rattler_solve = { path = "../rattler-1/crates/rattler_solve" } | ||
# rattler_virtual_packages = { path = "../rattler-1/crates/rattler_virtual_packages" } | ||
# rattler_lock = { path = "../rattler-1/crates/rattler_lock" } | ||
# rattler_package_streaming = { path = "../rattler-1/crates/rattler_package_streaming" } | ||
# rattler = { path = "../rattler-1/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" } | ||
#rattler_repodata_gateway = { path = "../rattler/crates/rattler_repodata_gateway" } | ||
#rattler_shell = { path = "../rattler/crates/rattler_shell" } | ||
#rattler_solve = { path = "../rattler/crates/rattler_solve" } | ||
#rattler_virtual_packages = { path = "../rattler/crates/rattler_virtual_packages" } | ||
#rattler_lock = { path = "../rattler/crates/rattler_lock" } | ||
#rattler_package_streaming = { path = "../rattler/crates/rattler_package_streaming" } | ||
#rattler = { path = "../rattler/crates/rattler" } | ||
# Change these lines if you want a patched version of uv | ||
# [patch.'https://github.com/astral-sh/uv'] | ||
# pep440_rs = { git = "https://github.com/astral-sh/uv", rev = "65b17f6e81125064ea04c5cfef685516ab660cf5" } | ||
|
Oops, something went wrong.