You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tsfile.apache.org by co...@apache.org on 2026/09/17 07:36:31 UTC
(tsfile) 16/22: fix(packaging): omit empty Homebrew bottle spacing
This is an automated email from the ASF dual-hosted git repository.
ColinLeeo pushed a commit to branch feat/native-package-artifacts
in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 71cf606a64c015bc35156f3182c327db75132dca
Author: ColinLee <sh...@163.com>
AuthorDate: Thu Sep 10 21:12:20 2026 +0800
fix(packaging): omit empty Homebrew bottle spacing
---
packaging/scripts/render_homebrew_formula.py | 3 +++
packaging/tests/test_render_homebrew_formula.py | 1 +
2 files changed, 4 insertions(+)
diff --git a/packaging/scripts/render_homebrew_formula.py b/packaging/scripts/render_homebrew_formula.py
index a39ba31ee..60217917e 100644
--- a/packaging/scripts/render_homebrew_formula.py
+++ b/packaging/scripts/render_homebrew_formula.py
@@ -46,6 +46,9 @@ def render_formula(
unknown = set(TOKEN.findall(template)) - replacements.keys()
if unknown:
raise ValueError(f"Unknown Formula placeholders: {sorted(unknown)}")
+ if not bottle_block:
+ # Omit an empty standalone block and its following separator line.
+ template = re.sub(r"(?m)^[ \t]*@BOTTLE_BLOCK@\n(?:[ \t]*\n)?", "", template)
rendered = TOKEN.sub(lambda match: replacements[match.group(1)], template)
if TOKEN.search(rendered):
raise ValueError("Unresolved Formula placeholder")
diff --git a/packaging/tests/test_render_homebrew_formula.py b/packaging/tests/test_render_homebrew_formula.py
index 0c0047aed..a702c40d9 100644
--- a/packaging/tests/test_render_homebrew_formula.py
+++ b/packaging/tests/test_render_homebrew_formula.py
@@ -167,6 +167,7 @@ class RenderHomebrewFormulaTest(unittest.TestCase):
)
self.assertIn("#{rpath}", rendered)
self.assertNotRegex(rendered, r"@[A-Z0-9_]+@")
+ self.assertNotIn("\n\n\n", rendered)
if expected_block:
self.assertIn(BOTTLE_BLOCK, rendered)
else: