Merge pull request #2802 from minrk/trailing-newline

Author: beckermr

conda_forge_tick/migrators/cstdlib.py

@@ -245,9 +245,12 @@ def migrate(self, recipe_dir, attrs, **kwargs):
             # that in the conda_build_config, and remove all `__osx` constraints in
             # the meta.yaml (see further up).
             # this line almost always has a selector, keep the alignment
-            cbc_lines = _replacer(
+            new_cbc_lines = _replacer(
                 cbc_lines, r"^MACOSX_DEPLOYMENT_TARGET:", "c_stdlib_version:        "
             )
-
-            with open(fname, "w") as fp:
-                fp.write("".join(cbc_lines) + "\n")
+            if new_cbc_lines != cbc_lines:
+                with open(fname, "w") as fp:
+                    fp.write("".join(new_cbc_lines))
+                    if new_cbc_lines and not new_cbc_lines[-1].endswith("\n"):
+                        # ensure trailing newline
+                        fp.write("\n")

conda_forge_tick/migrators/migration_yaml.py

@@ -108,6 +108,9 @@ def merge_migrator_cbc(migrator_yaml: str, conda_build_config_yaml: str):
         # if this is in a key we didn't migrate, add the line (or it is a space)
         elif current_cbc_key not in migrator_keys or line.isspace() or not line:
             outbound_cbc.append(line)
+    if outbound_cbc and outbound_cbc[-1]:
+        # ensure trailing newline
+        outbound_cbc.append("")
     return "\n".join(outbound_cbc)
 
 

conda_forge_tick/migrators/mpi_pin_run_as_build.py

@@ -92,6 +92,9 @@ def migrate(self, recipe_dir, attrs, **kwargs):
             if len(new_lines) > 0:
                 with open(fname, "w") as fp:
                     fp.write("\n".join(new_lines))
+                    if new_lines[-1]:
+                        # ensure trailing newline
+                        fp.write("\n")
             else:
                 with pushd(recipe_dir):
                     subprocess.run(["rm", "-f", "conda_build_config.yaml"])