Skip to content

Commit a294b7e

Browse files
authored
Merge branch 'main' into bas/wip/develop-dependencies
2 parents 674033f + fab75fd commit a294b7e

36 files changed

+434
-169
lines changed

CHANGELOG.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,48 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
### [0.58.0] - 2025-10-22
9+
#### ✨ Highlights
10+
11+
12+
This release adds important bugfixes and changes in the discovery logic.
13+
Pixi Build already had the ability to directly depend on `recipe.yaml` files backed by `pixi-build-rattler-build` without the need to specify a separate package manifest.
14+
So the following code just works:
15+
16+
```toml
17+
[dependencies]
18+
package = { path = "/path/to/recipe.yaml" }
19+
```
20+
21+
This still works, but we stopped hardcoding the channel for the backends.
22+
Now, it will first try to find a workspace manifest and extract its channels.
23+
If that doesn't work, it will fallback to the default channels in your Pixi config.
24+
25+
#### Added
26+
27+
- Add some more debug-logging if rebuilds are acting up by @tdejager in [#4794](https://github.com/prefix-dev/pixi/pull/4794)
28+
29+
30+
#### Changed
31+
32+
- Automatic detection of ros backend for package.xml files by @ruben-arts in [#4782](https://github.com/prefix-dev/pixi/pull/4782)
33+
34+
35+
#### Documentation
36+
37+
- Fix link to boost package by @h-vetinari in [#4793](https://github.com/prefix-dev/pixi/pull/4793)
38+
39+
40+
#### Fixed
41+
42+
- Fix testsuite tests configuration by @remimimimimi in [#4795](https://github.com/prefix-dev/pixi/pull/4795)
43+
- Target specific inline variants by @Hofer-Julian in [#4803](https://github.com/prefix-dev/pixi/pull/4803)
44+
- Reinstall should rebuild a source package by @nichmor in [#4809](https://github.com/prefix-dev/pixi/pull/4809)
45+
46+
47+
#### New Contributors
48+
* @h-vetinari made their first contribution in [#4793](https://github.com/prefix-dev/pixi/pull/4793)
49+
850
### [0.57.0] - 2025-10-20
951
#### ✨ Highlights
1052

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ authors:
3030
- given-names: Julian
3131
family-names: Hofer
3232
33-
repository-code: 'https://github.com/prefix-dev/pixi/releases/tag/v0.57.0'
34-
url: 'https://pixi.sh/v0.57.0'
33+
repository-code: 'https://github.com/prefix-dev/pixi/releases/tag/v0.58.0'
34+
url: 'https://pixi.sh/v0.58.0'
3535
abstract: >-
3636
A cross-platform, language agnostic, package/project
3737
management tool for development in virtual environments.

Cargo.lock

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/pixi/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license.workspace = true
77
name = "pixi"
88
readme.workspace = true
99
repository.workspace = true
10-
version = "0.57.0"
10+
version = "0.58.0"
1111

1212
[features]
1313
default = ["rustls-tls"]

crates/pixi/tests/integration_rust/add_tests.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ async fn add_git_deps() {
695695

696696
let pixi = PixiControl::from_manifest(
697697
r#"
698-
[project]
698+
[workspace]
699699
name = "test-channel-change"
700700
channels = ["https://prefix.dev/conda-forge"]
701701
platforms = ["win-64"]
@@ -750,7 +750,7 @@ async fn add_git_deps_with_creds() {
750750

751751
let pixi = PixiControl::from_manifest(
752752
r#"
753-
[project]
753+
[workspace]
754754
name = "test-channel-change"
755755
channels = ["https://prefix.dev/conda-forge"]
756756
platforms = ["linux-64"]
@@ -805,10 +805,10 @@ async fn add_git_with_specific_commit() {
805805

806806
let pixi = PixiControl::from_manifest(
807807
r#"
808-
[project]
808+
[workspace]
809809
name = "test-channel-change"
810810
channels = ["https://prefix.dev/conda-forge"]
811-
platforms = ["win-64"]
811+
platforms = ["linux-64"]
812812
preview = ['pixi-build']"#,
813813
)
814814
.unwrap();
@@ -826,7 +826,7 @@ preview = ['pixi-build']"#,
826826
let git_package = lock
827827
.default_environment()
828828
.unwrap()
829-
.packages(Platform::Win64)
829+
.packages(Platform::Linux64)
830830
.unwrap()
831831
.find(|p| p.as_conda().unwrap().location().as_str().contains("git+"));
832832

@@ -857,7 +857,7 @@ async fn add_git_with_tag() {
857857

858858
let pixi = PixiControl::from_manifest(
859859
r#"
860-
[project]
860+
[workspace]
861861
name = "test-channel-change"
862862
channels = ["https://prefix.dev/conda-forge"]
863863
platforms = ["win-64"]
@@ -910,7 +910,7 @@ async fn add_plain_ssh_url() {
910910

911911
let pixi = PixiControl::from_manifest(
912912
r#"
913-
[project]
913+
[workspace]
914914
name = "test-channel-change"
915915
channels = ["https://prefix.dev/conda-forge"]
916916
platforms = ["linux-64"]
@@ -947,7 +947,7 @@ async fn add_pypi_git() {
947947
let pixi = PixiControl::from_manifest(
948948
format!(
949949
r#"
950-
[project]
950+
[workspace]
951951
name = "test-channel-change"
952952
channels = ["https://prefix.dev/conda-forge"]
953953
platforms = ["{platform}"]

crates/pixi/tests/integration_rust/snapshots/integration_rust__add_tests__add_git_deps-2.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
source: crates/pixi/tests/integration_rust/add_tests.rs
33
expression: pixi.workspace().unwrap().workspace.provenance.read().unwrap().into_inner()
44
---
5-
[project]
5+
[workspace]
66
name = "test-channel-change"
77
channels = ["https://prefix.dev/conda-forge"]
88
platforms = ["win-64"]

crates/pixi/tests/integration_rust/snapshots/integration_rust__add_tests__add_git_deps_with_creds-2.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
source: crates/pixi/tests/integration_rust/add_tests.rs
3-
expression: pixi.project().unwrap().manifest().source.to_string()
3+
expression: pixi.workspace().unwrap().modify().unwrap().manifest().document.to_string()
44
---
5-
[project]
5+
[workspace]
66
name = "test-channel-change"
77
channels = ["https://prefix.dev/conda-forge"]
88
platforms = ["linux-64"]

crates/pixi/tests/integration_rust/snapshots/integration_rust__add_tests__add_git_with_specific_commit-2.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
source: crates/pixi/tests/integration_rust/add_tests.rs
33
expression: pixi.workspace().unwrap().workspace.provenance.read().unwrap().into_inner()
44
---
5-
[project]
5+
[workspace]
66
name = "test-channel-change"
77
channels = ["https://prefix.dev/conda-forge"]
8-
platforms = ["win-64"]
8+
platforms = ["linux-64"]
99
preview = ['pixi-build']
1010

1111
[dependencies]

crates/pixi/tests/integration_rust/snapshots/integration_rust__add_tests__add_git_with_tag-2.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
source: crates/pixi/tests/integration_rust/add_tests.rs
33
expression: pixi.workspace().unwrap().workspace.provenance.read().unwrap().into_inner()
44
---
5-
[project]
5+
[workspace]
66
name = "test-channel-change"
77
channels = ["https://prefix.dev/conda-forge"]
88
platforms = ["win-64"]

crates/pixi/tests/integration_rust/snapshots/integration_rust__add_tests__add_plain_ssh_url.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
source: crates/pixi/tests/integration_rust/add_tests.rs
3-
expression: pixi.project().unwrap().manifest().source.to_string()
3+
expression: pixi.workspace().unwrap().workspace.provenance.read().unwrap().into_inner()
44
---
5-
[project]
5+
[workspace]
66
name = "test-channel-change"
77
channels = ["https://prefix.dev/conda-forge"]
88
platforms = ["linux-64"]

0 commit comments

Comments
 (0)