Skip to content

Commit

Permalink
Merge branch 'main' into feat/uv-0.2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
tdejager committed Jun 18, 2024
2 parents 7c3d5ef + f8f84d3 commit 63e2173
Show file tree
Hide file tree
Showing 75 changed files with 7,341 additions and 1,099 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
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
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
.vscode
.test-projects
__pycache__
**/**/.pixi
**/**/.build
.pixi
.build
.DS_store
site/
.cache
55 changes: 55 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,61 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.24.2] - 2024-06-14
#### Documentation
- Add readthedocs examples by @bollwyvl in [#1423](https://github.com/prefix-dev/pixi/pull/1423)
- Fix typo in project_configuration.md by @RaulPL in [#1502](https://github.com/prefix-dev/pixi/pull/1502)

#### Fixed
- Too much shell variables in activation of `pixi shell` by @ruben-arts in [#1507](https://github.com/prefix-dev/pixi/pull/1507)

## [0.24.1] - 2024-06-12
### 📃 Details
#### Fixed
- Replace http code %2b with + by @ruben-arts in [#1500](https://github.com/prefix-dev/pixi/pull/1500)

## [0.24.0] - 2024-06-12
### ✨ Highlights

- You can now run in a more isolated environment on `unix` machines, using `pixi run --clean-env TASK_NAME`.
- You can new easily clean your environment with `pixi clean` or the cache with `pixi clean cache`

### 📃 Details
#### Added

- Add `pixi clean` command by @ruben-arts in [#1325](https://github.com/prefix-dev/pixi/pull/1325)
- Add `--clean-env` flag to tasks and run command by @ruben-arts in [#1395](https://github.com/prefix-dev/pixi/pull/1395)
- Add `description` field to `task` by @jjjermiah in [#1479](https://github.com/prefix-dev/pixi/pull/1479)
- Add pixi file to the environment to add pixi specific details by @ruben-arts in [#1495](https://github.com/prefix-dev/pixi/pull/1495)

#### Changed

- Project environment cli by @baszalmstra in [#1433](https://github.com/prefix-dev/pixi/pull/1433)
- Update task list console output by @vigneshmanick in [#1443](https://github.com/prefix-dev/pixi/pull/1443)
- Upgrade uv by @tdejager in [#1436](https://github.com/prefix-dev/pixi/pull/1436)
- Sort packages in `list_global_packages` by @dhirschfeld in [#1458](https://github.com/prefix-dev/pixi/pull/1458)
- Added test for special chars wheel filename by @tdejager in [#1454](https://github.com/prefix-dev/pixi/pull/1454)

#### Documentation
- Improve multi env tasks documentation by @ruben-arts in [#1494](https://github.com/prefix-dev/pixi/pull/1494)

#### Fixed
- Use the activated environment when running a task by @tdejager in [#1461](https://github.com/prefix-dev/pixi/pull/1461)
- Fix authentication pypi-deps for download from lockfile by @tdejager in [#1460](https://github.com/prefix-dev/pixi/pull/1460)
- Display channels correctly in `pixi info` by @ruben-arts in [#1459](https://github.com/prefix-dev/pixi/pull/1459)
- Render help for `--frozen` by @ruben-arts in [#1468](https://github.com/prefix-dev/pixi/pull/1468)
- Don't record purl for non conda-forge channels by @nichmor in [#1451](https://github.com/prefix-dev/pixi/pull/1451)
- Use best_platform to verify the run platform by @ruben-arts in [#1472](https://github.com/prefix-dev/pixi/pull/1472)
- Creation of parent dir of symlink by @ruben-arts in [#1483](https://github.com/prefix-dev/pixi/pull/1483)
- `pixi install --all` output missing newline by @vigneshmanick in [#1487](https://github.com/prefix-dev/pixi/pull/1487)
- Don't error on already existing dependency by @ruben-arts in [#1449](https://github.com/prefix-dev/pixi/pull/1449)
- Remove debug true in release by @ruben-arts in [#1477](https://github.com/prefix-dev/pixi/pull/1477)

## New Contributors
* @dhirschfeld made their first contribution in [#1458](https://github.com/prefix-dev/pixi/pull/1458)

[Full commit history](https://github.com/prefix-dev/pixi/compare/v0.23.0..HEAD)

## [0.23.0] - 2024-05-27
### ✨ Highlights
- This release adds two new commands `pixi config` and `pixi update`
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
89 changes: 68 additions & 21 deletions Cargo.lock

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

33 changes: 18 additions & 15 deletions Cargo.toml
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]>"]
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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",
Expand All @@ -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",
] }

Expand Down Expand Up @@ -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" }
Expand Down
Loading

0 comments on commit 63e2173

Please sign in to comment.