Remove trailing newline

conda · Mar 15, 2024 · 60783ee · 60783ee
1 parent 56d6343
commit 60783ee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/conda_build/metadata.py b/conda_build/metadata.py
@@ -325,7 +325,7 @@ def select_lines(text: str, namespace: dict[str, Any], variants_in_place: bool)
                         f"exception:\n"
                         f"{e.__class__.__name__}: {e}\n"
                     )
-    return "\n".join(lines) + "\n"
+    return "\n".join(lines)
 
 
 def yamlize(data):

diff --git a/tests/test_metadata.py b/tests/test_metadata.py
@@ -57,14 +57,14 @@ def test_uses_vcs_in_metadata(testing_workdir, testing_metadata):
 def test_select_lines():
     lines = "\n".join(
         (
-            "",
+            "",  # preserve leading newline
             "test",
             "test [abc] no",
             "test [abc] # no",
             " ' test ' ",
             ' " test " ',
-            "",
-            "# comment line",
+            "",  # preserve newline
+            "# comment line",  # preserve comment line (not comment)
             "test [abc]",
             " 'quoted # [abc] '",
             ' "quoted # [abc] yes "',
@@ -74,20 +74,20 @@ def test_select_lines():
             "test {{ JINJA_VAR[:2] }} # stuff yes [abc]",
             "test {{ JINJA_VAR[:2] }} # [abc] stuff yes",
             '{{ environ["test"] }}  # [abc]',
-            "",  # trailing newline
+            "",  # trailing newline is lost
         )
     )
 
     assert select_lines(lines, {"abc": True}, variants_in_place=True) == "\n".join(
         (
-            "",
+            "",  # preserve leading newline
             "test",
             "test [abc] no",
             "test [abc] # no",
             " ' test '",
             ' " test "',
-            "",
-            "",
+            "",  # preserve newline
+            "",  # preserve comment line (not comment)
             "test",
             " 'quoted'",
             ' "quoted"',
@@ -97,21 +97,21 @@ def test_select_lines():
             "test {{ JINJA_VAR[:2] }}",
             "test {{ JINJA_VAR[:2] }}",
             '{{ environ["test"] }}',
-            "",  # trailing newline
+            # trailing newline is lost
         )
     )
     assert select_lines(lines, {"abc": False}, variants_in_place=True) == "\n".join(
         (
-            "",
+            "",  # preserve leading newline
             "test",
             "test [abc] no",
             "test [abc] # no",
             " ' test '",
             ' " test "',
-            "",
-            "",
+            "",  # preserve newline
+            "",  # preserve comment line (not comment)
             "test {{ JINJA_VAR[:2] }}",
-            "",  # trailing newline
+            # trailing newline is lost
         )
     )
 
@@ -155,7 +155,7 @@ def test_select_lines_battery():
                 )
                 * 10
             )
-            selection = "\n".join(selection) + "\n"  # trailing newline
+            selection = "\n".join(selection)
             assert select_lines(lines, namespace, variants_in_place=True) == selection