Skip to content

Commit 2c5dc3b

Browse files
author
Thibaut Oprinsen
committed
fix: fix indent fot linting
1 parent e197391 commit 2c5dc3b

3 files changed

Lines changed: 13 additions & 12 deletions

File tree

crates/pixi_build_rattler_build/src/protocol.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,22 +1380,22 @@ numpy:
13801380
use pixi_build_types::ProjectModel;
13811381
use rattler_conda_types::Version;
13821382
use std::str::FromStr;
1383-
1383+
13841384
let temp_dir = tempdir().unwrap();
13851385
let recipe_path = temp_dir.path().join("recipe.yaml");
1386-
1386+
13871387
// Recipe using ${{ PIXI_PACKAGE_VERSION }} directly — no hardcoded version
13881388
let recipe = "package:\n name: my-pkg\n version: ${{ PIXI_PACKAGE_VERSION }}\n\nbuild:\n number: 0\n";
13891389
tokio::fs::write(&recipe_path, recipe)
13901390
.await
13911391
.expect("Failed to write recipe");
1392-
1392+
13931393
let project_model = ProjectModel {
13941394
name: Some("my-pkg".to_string()),
13951395
version: Some(Version::from_str("1.2.3").unwrap()),
13961396
..Default::default()
13971397
};
1398-
1398+
13991399
let factory = RattlerBuildBackendInstantiator::new(LoggingOutputHandler::default())
14001400
.initialize(InitializeParams {
14011401
workspace_directory: None,
@@ -1408,7 +1408,7 @@ numpy:
14081408
})
14091409
.await
14101410
.unwrap();
1411-
1411+
14121412
let result = factory
14131413
.0
14141414
.conda_outputs(CondaOutputsParams {
@@ -1421,7 +1421,7 @@ numpy:
14211421
})
14221422
.await
14231423
.unwrap();
1424-
1424+
14251425
assert_eq!(result.outputs.len(), 1);
14261426
assert_eq!(
14271427
result.outputs[0].metadata.version.to_string(),
@@ -1459,7 +1459,8 @@ numpy:
14591459

14601460
#[test]
14611461
fn test_inject_version_existing_context_other_keys_preserved() {
1462-
let recipe = "context:\n lib_version: \"2.0\"\n suffix: \"-dev\"\npackage:\n name: foo\n";
1462+
let recipe =
1463+
"context:\n lib_version: \"2.0\"\n suffix: \"-dev\"\npackage:\n name: foo\n";
14631464
let result = super::inject_pixi_version_into_context(recipe, "3.0.0").unwrap();
14641465
assert!(result.contains("PIXI_PACKAGE_VERSION: \"3.0.0\""));
14651466
assert!(result.contains("lib_version: \"2.0\""));

crates/pixi_build_rattler_build/src/rattler_build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub struct RattlerBuildBackend {
2222
pub(crate) config: RattlerBuildBackendConfig,
2323
/// Workspace dependencies from the project model
2424
pub(crate) workspace_dependencies: HashMap<String, SourcePackageSpec>,
25-
pub(crate) package_version: Option<String>,
25+
pub(crate) package_version: Option<String>,
2626
}
2727

2828
impl RattlerBuildBackend {
@@ -98,7 +98,7 @@ impl RattlerBuildBackend {
9898
cache_dir,
9999
config,
100100
workspace_dependencies: HashMap::new(),
101-
package_version: None,
101+
package_version: None,
102102
})
103103
}
104104
}

crates/pixi_cli/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ pixi_utils = { workspace = true, default-features = false }
6363
pixi_uv_conversions = { workspace = true }
6464
rattler = { workspace = true, features = ["cli-tools", "indicatif"] }
6565
rattler_conda_types = { workspace = true }
66+
rattler_index = { workspace = true }
6667
rattler_lock = { workspace = true }
6768
rattler_networking = { workspace = true, default-features = false }
68-
rattler_shell = { workspace = true, features = ["sysinfo"] }
69-
rattler_solve = { workspace = true, features = ["resolvo", "serde"] }
70-
rattler_index = { workspace = true }
7169
rattler_package_streaming = { workspace = true }
7270
rattler_s3 = { workspace = true }
71+
rattler_shell = { workspace = true, features = ["sysinfo"] }
72+
rattler_solve = { workspace = true, features = ["resolvo", "serde"] }
7373
rattler_upload = { workspace = true }
7474
rattler_virtual_packages = { workspace = true }
7575
regex = { workspace = true }

0 commit comments

Comments
 (0)