From b4c440db34f336d5405d1ddaa9aec1d2646089fa Mon Sep 17 00:00:00 2001
From: Bas Zalmstra <zalmstra.bas@gmail.com>
Date: Mon, 27 May 2024 16:37:34 +0200
Subject: [PATCH 1/4] fix: rename rattler_build to rattler-build
---
src/system_tools.rs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/system_tools.rs b/src/system_tools.rs
index 2575dc10b..8842404e4 100644
--- a/src/system_tools.rs
+++ b/src/system_tools.rs
@@ -24,6 +24,7 @@ pub enum ToolError {
#[serde(rename_all = "snake_case")]
pub enum Tool {
/// The rattler build tool itself
+ #[serde(rename = "rattler-build")]
RattlerBuild,
/// The patch tool
Patch,
@@ -43,7 +44,7 @@ impl std::fmt::Display for Tool {
f,
"{}",
match self {
- Tool::RattlerBuild => "rattler_build".to_string(),
+ Tool::RattlerBuild => "rattler-build".to_string(),
Tool::Codesign => "codesign".to_string(),
Tool::Patch => "patch".to_string(),
Tool::Patchelf => "patchelf".to_string(),
From 6f71d5a50f304e5759145f05f53dac68c01ae5c4 Mon Sep 17 00:00:00 2001
From: Bas Zalmstra <zalmstra.bas@gmail.com>
Date: Mon, 27 May 2024 16:38:34 +0200
Subject: [PATCH 2/4] fix: test-data
---
test-data/rendered_recipes/curl_recipe.yaml | 2 +-
test-data/rendered_recipes/git_source.yaml | 2 +-
test-data/rendered_recipes/rich_recipe.yaml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/test-data/rendered_recipes/curl_recipe.yaml b/test-data/rendered_recipes/curl_recipe.yaml
index 021c83864..1f1ec51b6 100644
--- a/test-data/rendered_recipes/curl_recipe.yaml
+++ b/test-data/rendered_recipes/curl_recipe.yaml
@@ -642,4 +642,4 @@ finalized_dependencies:
constrains: []
run_exports: null
system_tools:
- rattler_build: 0.12.1
+ rattler-build: 0.12.1
diff --git a/test-data/rendered_recipes/git_source.yaml b/test-data/rendered_recipes/git_source.yaml
index 8f8b2a0f5..9187f957b 100644
--- a/test-data/rendered_recipes/git_source.yaml
+++ b/test-data/rendered_recipes/git_source.yaml
@@ -67,4 +67,4 @@ finalized_sources:
rev: df83c1edf287a756b8fc995e03e9632af0344777
target_directory: initial_version
system_tools:
- rattler_build: 0.12.1
+ rattler-build: 0.12.1
diff --git a/test-data/rendered_recipes/rich_recipe.yaml b/test-data/rendered_recipes/rich_recipe.yaml
index 2bbcfd615..cbce7ca9a 100644
--- a/test-data/rendered_recipes/rich_recipe.yaml
+++ b/test-data/rendered_recipes/rich_recipe.yaml
@@ -391,4 +391,4 @@ finalized_dependencies:
constrains: []
run_exports: null
system_tools:
- rattler_build: 0.12.1
+ rattler-build: 0.12.1
From 8db1cff28d30fcc38d565463ae1dceeedb14c3af Mon Sep 17 00:00:00 2001
From: Bas Zalmstra <zalmstra.bas@gmail.com>
Date: Mon, 27 May 2024 16:39:41 +0200
Subject: [PATCH 3/4] fix: snapshots
---
.../rattler_build__metadata__test__read_full_recipe.snap | 3 ++-
...attler_build__metadata__test__read_recipe_with_sources.snap | 3 ++-
.../rattler_build__system_tools__tests__serialize.snap | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/snapshots/rattler_build__metadata__test__read_full_recipe.snap b/src/snapshots/rattler_build__metadata__test__read_full_recipe.snap
index 26f7e7ca2..901962e4b 100644
--- a/src/snapshots/rattler_build__metadata__test__read_full_recipe.snap
+++ b/src/snapshots/rattler_build__metadata__test__read_full_recipe.snap
@@ -1,5 +1,6 @@
---
source: src/metadata.rs
+assertion_line: 728
expression: output_rich
---
recipe:
@@ -391,4 +392,4 @@ finalized_dependencies:
run_exports: ~
finalized_sources: ~
system_tools:
- rattler_build: 0.12.1
+ rattler-build: 0.12.1
diff --git a/src/snapshots/rattler_build__metadata__test__read_recipe_with_sources.snap b/src/snapshots/rattler_build__metadata__test__read_recipe_with_sources.snap
index f243792dd..65ae77d80 100644
--- a/src/snapshots/rattler_build__metadata__test__read_recipe_with_sources.snap
+++ b/src/snapshots/rattler_build__metadata__test__read_recipe_with_sources.snap
@@ -1,5 +1,6 @@
---
source: src/metadata.rs
+assertion_line: 744
expression: git_source_output
---
recipe:
@@ -71,4 +72,4 @@ finalized_sources:
rev: df83c1edf287a756b8fc995e03e9632af0344777
target_directory: initial_version
system_tools:
- rattler_build: 0.12.1
+ rattler-build: 0.12.1
diff --git a/src/snapshots/rattler_build__system_tools__tests__serialize.snap b/src/snapshots/rattler_build__system_tools__tests__serialize.snap
index 0e2a9b591..f890f430f 100644
--- a/src/snapshots/rattler_build__system_tools__tests__serialize.snap
+++ b/src/snapshots/rattler_build__system_tools__tests__serialize.snap
@@ -1,10 +1,11 @@
---
source: src/system_tools.rs
+assertion_line: 284
expression: json
---
{
"git": "3.0.0",
"install_name_tool": "2.0.0",
"patchelf": "1.0.0",
- "rattler_build": "0.0.0"
+ "rattler-build": "0.0.0"
}
From e21abadac8b1356acf9991cc0ac5e7cfa267e1ea Mon Sep 17 00:00:00 2001
From: Bas Zalmstra <zalmstra.bas@gmail.com>
Date: Mon, 27 May 2024 16:45:50 +0200
Subject: [PATCH 4/4] fix: final snapshot
---
.../rattler_build__metadata__test__read_full_recipe-2.snap | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/snapshots/rattler_build__metadata__test__read_full_recipe-2.snap b/src/snapshots/rattler_build__metadata__test__read_full_recipe-2.snap
index 511a2891c..9305597e2 100644
--- a/src/snapshots/rattler_build__metadata__test__read_full_recipe-2.snap
+++ b/src/snapshots/rattler_build__metadata__test__read_full_recipe-2.snap
@@ -1,5 +1,6 @@
---
source: src/metadata.rs
+assertion_line: 733
expression: output_curl
---
recipe:
@@ -645,4 +646,4 @@ finalized_dependencies:
run_exports: ~
finalized_sources: ~
system_tools:
- rattler_build: 0.12.1
+ rattler-build: 0.12.1