From 989838cd0b1322895ab08da4bd4a2bedc06d35ad Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Tue, 8 Oct 2024 07:28:20 +0200 Subject: [PATCH] chore: release v0.32.0 (#2223) Co-authored-by: Ruben Arts --- CHANGELOG.md | 14 ++++++++ CITATION.cff | 4 +-- Cargo.lock | 46 ++++++++++++------------- Cargo.toml | 18 +++++----- crates/pixi_consts/src/consts.rs | 2 +- crates/pixi_pty/src/unix/pty_session.rs | 2 +- docs/advanced/github_actions.md | 2 +- install/install.ps1 | 2 +- install/install.sh | 2 +- schema/schema.json | 4 +-- src/cli/mod.rs | 2 +- tbump.toml | 4 +-- tests/integration/common.py | 2 +- 13 files changed, 59 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b711a9e09..8920aef70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,20 @@ 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.32.0] - 2024-10-08 +#### ✨ Highlights + +The biggest fix in this PR is the move to the latest rattler as it came with some major bug fixes for macOS and Rust 1.81 compatibility. + +#### Changed +- Correctly implement total ordering for dependency provider by @tdejager in [rattler/#892](https://github.com/conda/rattler/pull/892) + +#### Fixed +- Fixed self-clobber issue when up/down grading packages by @wolfv in [rattler/#893](https://github.com/conda/rattler/pull/893) +- Check environment name before returning not found print by @ruben-arts in [#2198](https://github.com/prefix-dev/pixi/pull/2198) +- Turn off symlink follow for task cache by @ruben-arts in [#2209](https://github.com/prefix-dev/pixi/pull/2209) + + ### [0.31.0] - 2024-10-03 #### ✨ Highlights Thanks to our maintainer @baszamstra! diff --git a/CITATION.cff b/CITATION.cff index 81ae87aa8..0450733c1 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -24,8 +24,8 @@ authors: name-particle: de family-names: Jager email: tdejager89@gmail.com -repository-code: 'https://github.com/prefix-dev/pixi/releases/tag/v0.31.0' -url: 'https://pixi.sh/v0.31.0' +repository-code: 'https://github.com/prefix-dev/pixi/releases/tag/v0.32.0' +url: 'https://pixi.sh/v0.32.0' abstract: >- A cross-platform, language agnostic, package/project management tool for development in virtual environments. diff --git a/Cargo.lock b/Cargo.lock index 13031bdfe..027a6b46b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3308,7 +3308,7 @@ dependencies = [ [[package]] name = "pixi" -version = "0.31.0" +version = "0.32.0" dependencies = [ "ahash 0.8.11", "assert_matches", @@ -3927,9 +3927,9 @@ dependencies = [ [[package]] name = "rattler" -version = "0.27.14" +version = "0.27.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a8488d78fb6fa616eeaed34dd3e3ae28de3d41f5fd0f2a692b714546769f6d" +checksum = "c338b18f3b9302f1b2bc16810c6a30bc9e98f2c40f37d8658616dbd74a181bcd" dependencies = [ "anyhow", "clap", @@ -3968,9 +3968,9 @@ dependencies = [ [[package]] name = "rattler_cache" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50307f280939786d161dc4a117032bb3aabd8fd1301f3fcaf63caa095638d990" +checksum = "55d1681b88074033ade946e04db58397e9d2f317964d68ec77215c2a685a9ed6" dependencies = [ "anyhow", "dashmap", @@ -3996,9 +3996,9 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.28.1" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cd1f00e6500bd4252ebb414d1c83aad05e0ab4c177e577344011d38d49ef223" +checksum = "4c92d862645c581c7abe238e7fb6295750dd389bb27ca19e05162342e0754f8a" dependencies = [ "chrono", "dirs", @@ -4049,9 +4049,9 @@ dependencies = [ [[package]] name = "rattler_lock" -version = "0.22.26" +version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ff07b4be849f3eeb334d36d0e3496f8e0fdf096d7ca2b2142b2cbe66e60515" +checksum = "bbca358701d8308ff9090b221ca682c8c92aab32988c1774b7fdc7175d824021" dependencies = [ "chrono", "file_url", @@ -4110,9 +4110,9 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.22.9" +version = "0.22.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a3584bca0b2b7c67c61ae15c280f2202b6590e6afb201a83186432114dc53" +checksum = "ac020482d1e8eac6aa1114bc87f2af426a8c719e56b7798afe331354a41d1e5e" dependencies = [ "bzip2", "chrono", @@ -4149,9 +4149,9 @@ dependencies = [ [[package]] name = "rattler_repodata_gateway" -version = "0.21.16" +version = "0.21.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89a4c1042b0ae79c38f13292fd27a6b8319dcb056928ac688eab67214a6fc125" +checksum = "a3da152300247f1ce8baa6233acdc86494f38ddf2202a47bf50d54b810675e2d" dependencies = [ "anyhow", "async-compression", @@ -4204,9 +4204,9 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.22.3" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a7d11ca9da7e3954764cb37b96dea0e07c59fbe2f35363083926618a192a2a" +checksum = "1b9ab12a632b2a9641c4935d160ac181564a66ca56767780bf6ffa9814161dd5" dependencies = [ "enum_dispatch", "indexmap 2.3.0", @@ -4222,9 +4222,9 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "1.0.10" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee39b9a5a7e3f1506392034bb39fb7bcac5a296c3ce411a57f285250d953258" +checksum = "726c21f9119981b47fab512da5d94ddd139617a45ed2863aa709958badc26510" dependencies = [ "chrono", "futures", @@ -4241,9 +4241,9 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5386d3d7d4e7894f4eeee35b0a3ef204f55993c6eeb7e3fc772ec4566df679f1" +checksum = "7f6d62812b0b3050fb63ebb3368dd1b64eac3a4d6eb2509bae04d49200b036c5" dependencies = [ "archspec", "libloading", @@ -4590,9 +4590,9 @@ dependencies = [ [[package]] name = "resolvo" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68c0ae687bbcd99ab33236c7cbccd2ba1c526a7f7a59743cb991074414c5293" +checksum = "1621ce52e3ff36c8f55f0017f1e4909f59514af8f852ee943997760bf12c7c15" dependencies = [ "ahash 0.8.11", "bitvec", @@ -5924,9 +5924,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typed-path" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04645b6c01cfb2ddabffc7c67ae6bfe7c3e28a5c37d729f6bb498e784f1fd70c" +checksum = "50c0c7479c430935701ff2532e3091e6680ec03f2f89ffcd9988b08e885b90a5" [[package]] name = "typeid" diff --git a/Cargo.toml b/Cargo.toml index bf21723ea..5f8f34c6f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,16 +89,16 @@ typed-path = "0.9.1" # Rattler crates file_url = "0.1.4" -rattler = { version = "0.27.14", default-features = false } -rattler_cache = { version = "0.2.5", default-features = false } -rattler_conda_types = { version = "0.28.1", default-features = false } +rattler = { version = "0.27.15", default-features = false } +rattler_cache = { version = "0.2.6", default-features = false } +rattler_conda_types = { version = "0.28.2", default-features = false } rattler_digest = { version = "1.0.1", default-features = false } -rattler_lock = { version = "0.22.26", default-features = false } +rattler_lock = { version = "0.22.27", default-features = false } rattler_networking = { version = "0.21.4", default-features = false } -rattler_repodata_gateway = { version = "0.21.16", default-features = false } -rattler_shell = { version = "0.22.3", default-features = false } -rattler_solve = { version = "1.0.10", default-features = false } -rattler_virtual_packages = { version = "1.1.6", default-features = false } +rattler_repodata_gateway = { version = "0.21.17", default-features = false } +rattler_shell = { version = "0.22.4", default-features = false } +rattler_solve = { version = "1.1.0", default-features = false } +rattler_virtual_packages = { version = "1.1.7", default-features = false } # Bumping this to a higher version breaks the Windows path handling. url = "2.5.0" @@ -141,7 +141,7 @@ license.workspace = true name = "pixi" readme.workspace = true repository.workspace = true -version = "0.31.0" +version = "0.32.0" [features] default = ["rustls-tls"] diff --git a/crates/pixi_consts/src/consts.rs b/crates/pixi_consts/src/consts.rs index a90372951..ecc4674cb 100644 --- a/crates/pixi_consts/src/consts.rs +++ b/crates/pixi_consts/src/consts.rs @@ -12,7 +12,7 @@ pub const PYPROJECT_MANIFEST: &str = "pyproject.toml"; pub const PROJECT_LOCK_FILE: &str = "pixi.lock"; pub const CONFIG_FILE: &str = "config.toml"; pub const PIXI_DIR: &str = ".pixi"; -pub const PIXI_VERSION: &str = "0.31.0"; +pub const PIXI_VERSION: &str = "0.32.0"; pub const PREFIX_FILE_NAME: &str = "pixi_env_prefix"; pub const ENVIRONMENTS_DIR: &str = "envs"; pub const SOLVE_GROUP_ENVIRONMENTS_DIR: &str = "solve-group-envs"; diff --git a/crates/pixi_pty/src/unix/pty_session.rs b/crates/pixi_pty/src/unix/pty_session.rs index 310cfd7f6..61635d8fb 100644 --- a/crates/pixi_pty/src/unix/pty_session.rs +++ b/crates/pixi_pty/src/unix/pty_session.rs @@ -63,7 +63,7 @@ impl PtySession { /// Returns number of written bytes. pub fn send_line(&mut self, line: &str) -> io::Result { let mut len = self.send(line)?; - len += self.process_stdin.write(&[b'\n'])?; + len += self.process_stdin.write(b"\n")?; Ok(len) } diff --git a/docs/advanced/github_actions.md b/docs/advanced/github_actions.md index 162989e85..e4dbe3b90 100644 --- a/docs/advanced/github_actions.md +++ b/docs/advanced/github_actions.md @@ -15,7 +15,7 @@ We created [prefix-dev/setup-pixi](https://github.com/prefix-dev/setup-pixi) to ```yaml - uses: prefix-dev/setup-pixi@v0.8.0 with: - pixi-version: v0.31.0 + pixi-version: v0.32.0 cache: true auth-host: prefix.dev auth-token: ${{ secrets.PREFIX_DEV_TOKEN }} diff --git a/install/install.ps1 b/install/install.ps1 index 8059e8336..cd3df90c9 100644 --- a/install/install.ps1 +++ b/install/install.ps1 @@ -18,7 +18,7 @@ .LINK https://github.com/prefix-dev/pixi .NOTES - Version: v0.31.0 + Version: v0.32.0 #> param ( [string] $PixiVersion = 'latest', diff --git a/install/install.sh b/install/install.sh index 2c2de6f0e..cd163b29a 100644 --- a/install/install.sh +++ b/install/install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -euo pipefail -# Version: v0.31.0 +# Version: v0.32.0 __wrap__() { diff --git a/schema/schema.json b/schema/schema.json index 980d61c23..bd035f31e 100644 --- a/schema/schema.json +++ b/schema/schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema#", - "$id": "https://pixi.sh/v0.31.0/schema/manifest/schema.json", + "$id": "https://pixi.sh/v0.32.0/schema/manifest/schema.json", "title": "`pixi.toml` manifest file", "description": "The configuration for a [`pixi`](https://pixi.sh) project.", "type": "object", @@ -13,7 +13,7 @@ "title": "Schema", "description": "The schema identifier for the project's configuration", "type": "string", - "default": "https://pixi.sh/v0.31.0/schema/manifest/schema.json", + "default": "https://pixi.sh/v0.32.0/schema/manifest/schema.json", "format": "uri-reference" }, "activation": { diff --git a/src/cli/mod.rs b/src/cli/mod.rs index bdd3a9481..e33cc175f 100644 --- a/src/cli/mod.rs +++ b/src/cli/mod.rs @@ -41,7 +41,7 @@ pub mod upload; #[command( version, about = " -Pixi [version 0.31.0] - Developer Workflow and Environment Management for Multi-Platform, Language-Agnostic Projects. +Pixi [version 0.32.0] - Developer Workflow and Environment Management for Multi-Platform, Language-Agnostic Projects. Pixi is a versatile developer workflow tool designed to streamline the management of your project's dependencies, tasks, and environments. Built on top of the Conda ecosystem, Pixi offers seamless integration with the PyPI ecosystem. diff --git a/tbump.toml b/tbump.toml index 7c8fd3fd8..934bc9ae3 100644 --- a/tbump.toml +++ b/tbump.toml @@ -1,7 +1,7 @@ github_url = "https://github.com/prefix-dev/pixi" [version] -current = "0.31.0" +current = "0.32.0" # Example of a semver regexp. # Make sure this matches current_version before @@ -19,7 +19,7 @@ regex = ''' [git] # The current version will get updated when tbump is run -message_template = "Bump version: 0.31.0 → {new_version}" +message_template = "Bump version: 0.32.0 → {new_version}" tag_template = "v{new_version}" # For each file to patch, add a [[file]] config diff --git a/tests/integration/common.py b/tests/integration/common.py index c60390284..68b2ecf25 100644 --- a/tests/integration/common.py +++ b/tests/integration/common.py @@ -2,7 +2,7 @@ from pathlib import Path import subprocess -PIXI_VERSION = "0.31.0" +PIXI_VERSION = "0.32.0" class ExitCode(IntEnum):