chore: unfurl unecessary try/except blocks

Author: Justintime50

CHANGELOG.md

@@ -1,9 +1,9 @@
 # CHANGELOG
 
-## Next Release
+## v3.1.0 (2025-12-26)
 
-- Changes order of git push and checksum upload operations essentially making any checksum upload failures decoupled from the ability to actually release. Any failures with checksum upload will occur after formula update pushes
 - Adds `skip_checksum` parameter which skips uploading the checksum file for all release assets to the latest release. Useful if you generate your own checksums or already had a checksum file since we cannot overwrite an existing checksum file without deleting the previous one
+- Changes order of git push and checksum upload operations essentially making any checksum upload failures decoupled from the ability to actually release. Any failures with checksum upload will occur after formula update pushes
 - Creates formula folder if it doesn't exist yet
 - Fixes the formula dir path (regression introduced in v3.0.1, closes #67)
 

homebrew_releaser/_version.py

@@ -1 +1 @@
-__version__ = "3.0.1"
+__version__ = "3.1.0"

homebrew_releaser/checksum.py

@@ -19,12 +19,9 @@ def calculate_checksum(tar_filepath: str) -> str:
     """Gets the checksum of a file."""
     logger = woodchips.get(LOGGER_NAME)
 
-    try:
-        with open(build_dir_path(tar_filepath), "rb") as content:
-            checksum = hashlib.sha256(content.read()).hexdigest()
-        logger.debug(f"Checksum for {tar_filepath} generated successfully: {checksum}")
-    except Exception as error:
-        raise SystemExit(error)
+    with open(build_dir_path(tar_filepath), "rb") as content:
+        checksum = hashlib.sha256(content.read()).hexdigest()
+    logger.debug(f"Checksum for {tar_filepath} generated successfully: {checksum}")
 
     return checksum
 
@@ -42,14 +39,11 @@ def upload_checksum_file(latest_release: dict[str, Any]):
     headers = GITHUB_HEADERS.copy()
     headers["Content-Type"] = "text/plain"
 
-    try:
-        response = requests.post(
-            upload_url,
-            headers=headers,
-            data=checksum_file_content,
-            timeout=TIMEOUT,
-        )
-        response.raise_for_status()
-        logger.info(f"checksum.txt uploaded successfully to {GITHUB_REPO}.")
-    except requests.exceptions.RequestException as error:
-        raise SystemExit(error)
+    response = requests.post(
+        upload_url,
+        headers=headers,
+        data=checksum_file_content,
+        timeout=TIMEOUT,
+    )
+    response.raise_for_status()
+    logger.info(f"checksum.txt uploaded successfully to {GITHUB_REPO}.")

homebrew_releaser/formula.py

@@ -195,16 +195,6 @@ def install
 end
 """
 
-    def match_indent_of(tag: str, text: str) -> str:
-        pattern = r"(?m)^(?P<indent>\s*)\{\{\{\s*" + re.escape(tag) + r"\s*\}\}\}"
-        matching_line = re.search(pattern, template)
-        indent = matching_line and matching_line["indent"] or ""
-        # Indent by the same amount as the template tag
-        indented_text = textwrap.indent(text.strip(), indent)
-        # Strip the indentation from the first line, because
-        # the template will render it indented already
-        return indented_text.lstrip()
-
     target_darwin = True if TARGET_DARWIN_AMD64 or TARGET_DARWIN_ARM64 else False
     target_linux = True if TARGET_LINUX_AMD64 or TARGET_LINUX_ARM64 else False
 
@@ -217,11 +207,13 @@ def match_indent_of(tag: str, text: str) -> str:
         "autogenerated_tar_checksum": autogenerated_tar_checksum,
         "license_type": license_type,
         "dependencies": dependencies_list,
-        "install_instructions": match_indent_of("install_instructions", install),
-        "test_instructions": match_indent_of("test_instructions", test) if test else None,
+        "install_instructions": _match_indent_of(template, "install_instructions", install),
+        "test_instructions": _match_indent_of(template, "test_instructions", test) if test else None,
         "download_strategy": download_strategy,
         "custom_require": custom_require,
-        "formula_includes": match_indent_of("formula_includes", formula_includes) if formula_includes else None,
+        "formula_includes": (
+            _match_indent_of(template, "formula_includes", formula_includes) if formula_includes else None
+        ),
         "version": version,
         "darwin_amd64_url": darwin_amd64_url,
         "darwin_amd64_checksum": darwin_amd64_checksum,
@@ -254,6 +246,18 @@ def match_indent_of(tag: str, text: str) -> str:
     return rendered_template
 
 
+def _match_indent_of(template: str, tag: str, text: str) -> str:
+    """Matches the indentation of a template tag for proper formatting."""
+    pattern = r"(?m)^(?P<indent>\s*)\{\{\{\s*" + re.escape(tag) + r"\s*\}\}\}"
+    matching_line = re.search(pattern, template)
+    indent = matching_line and matching_line["indent"] or ""
+    # Indent by the same amount as the template tag
+    indented_text = textwrap.indent(text.strip(), indent)
+    # Strip the indentation from the first line, because
+    # the template will render it indented already
+    return indented_text.lstrip()
+
+
 def _generate_class_name(repo_name: str) -> str:
     """Generates a Homebrew compatible formula class name.
 

homebrew_releaser/git.py

@@ -81,18 +81,11 @@ def _run_git_subprocess(command: list[str], debug_message: Optional[str] = None)
     """Runs a git subprocess."""
     logger = woodchips.get(LOGGER_NAME)
 
-    try:
-        subprocess.check_output(  # nosec
-            command,
-            stderr=subprocess.STDOUT,
-            text=True,
-            timeout=TIMEOUT,
-        )
-        if debug_message:
-            logger.debug(debug_message)
-    except subprocess.CalledProcessError as error:
-        logger.critical(error.output)
-        raise
-    except Exception as error:
-        logger.critical(error)
-        raise
+    subprocess.check_output(  # nosec
+        command,
+        stderr=subprocess.STDOUT,
+        text=True,
+        timeout=TIMEOUT,
+    )
+    if debug_message:
+        logger.debug(debug_message)

homebrew_releaser/homebrew.py

@@ -24,8 +24,6 @@ def update_python_resources(formula_dir: str, formula_filename: str) -> None:
             shell=True,  # nosec
         )
         logger.info("Updated Python resources successfully.")
-    except subprocess.TimeoutExpired:
-        raise SystemExit("Timed out updating Python resources")
     except subprocess.CalledProcessError as e:
         error_output = e.output if hasattr(e, "output") else ""
 
@@ -47,8 +45,6 @@ def setup_homebrew_tap(homebrew_owner: str, homebrew_tap: str) -> None:
             shell=True,  # nosec
         )
         logger.info("Set up Homebrew tap successfully.")
-    except subprocess.TimeoutExpired:
-        raise SystemExit("Timed out setting up Homebrew tap")
     except subprocess.CalledProcessError as e:
         error_output = e.output if hasattr(e, "output") else ""
 
@@ -67,8 +63,6 @@ def get_homebrew_version() -> str:
             timeout=TIMEOUT,
             shell=True,  # nosec
         )
-    except subprocess.TimeoutExpired:
-        raise SystemExit("Timed out getting Homebrew version")
     except subprocess.CalledProcessError as e:
         error_output = e.output if hasattr(e, "output") else ""
 

homebrew_releaser/utils.py

@@ -20,18 +20,15 @@ def make_github_get_request(url: str, stream: Optional[bool] = False) -> request
     if stream:
         headers["Accept"] = "application/octet-stream"
 
-    try:
-        response = requests.get(
-            url,
-            headers=headers,
-            allow_redirects=True,  # We need to allow redirects to reach various GitHub resources
-            stream=stream,
-            timeout=TIMEOUT,
-        )
-        response.raise_for_status()
-        logger.debug(f"HTTP GET request made successfully to {url}.")
-    except Exception as error:
-        raise SystemExit(error)
+    response = requests.get(
+        url,
+        headers=headers,
+        allow_redirects=True,  # We need to allow redirects to reach various GitHub resources
+        stream=stream,
+        timeout=TIMEOUT,
+    )
+    response.raise_for_status()
+    logger.debug(f"HTTP GET request made successfully to {url}.")
 
     return response
 
@@ -40,12 +37,9 @@ def write_file(file_path: str, content: str | bytes, mode: str = "w"):
     """Writes content to a file."""
     logger = woodchips.get(LOGGER_NAME)
 
-    try:
-        with open(build_dir_path(file_path), mode) as f:
-            f.write(content)
-        logger.debug(f"{file_path} written successfully.")
-    except Exception as error:
-        raise SystemExit(error)
+    with open(build_dir_path(file_path), mode) as f:
+        f.write(content)
+    logger.debug(f"{file_path} written successfully.")
 
 
 def get_filename_from_path(path: str) -> str:

test/unit/test_checksum.py

@@ -25,7 +25,7 @@ def test_calculate_checksum():
     "subprocess.check_output", side_effect=subprocess.CalledProcessError(returncode=1, cmd="subprocess.check_output")
 )
 def test_calculate_checksum_process_error(mock_subprocess, mock_tar_filename):
-    with pytest.raises(SystemExit):
+    with pytest.raises(FileNotFoundError):
         calculate_checksum(mock_tar_filename)
 
 
@@ -46,7 +46,7 @@ def test_upload_checksum_file(mock_make_github_get_request, mock_post_request):
 def test_upload_checksum_file_error_on_upload(mock_make_github_get_request, mock_post_request):
     """Tests that we exit on error to upload checksum.txt file."""
     with patch("builtins.open", mock_open()):
-        with pytest.raises(SystemExit) as error:
+        with pytest.raises(requests.exceptions.RequestException) as error:
             upload_checksum_file({"id": 1, "tag_name": "v1.0.0"})
 
             mock_post_request.assert_called_once()

test/unit/test_utils.py

@@ -49,7 +49,7 @@ def test_make_github_get_request_stream(mock_request):
 @patch("requests.get", side_effect=requests.exceptions.RequestException("mock-error"))
 def test_make_github_get_request_exception(mock_request):
     url = "https://api.github.com/repos/Justintime50/homebrew-releaser"
-    with pytest.raises(SystemExit) as error:
+    with pytest.raises(requests.exceptions.RequestException) as error:
         make_github_get_request(url=url)
 
     assert "mock-error" == str(error.value)
@@ -63,7 +63,7 @@ def test_write_file():
 def test_write_file_exception():
     with patch("builtins.open", mock_open()) as mock_open_file:
         mock_open_file.side_effect = Exception
-        with pytest.raises(SystemExit):
+        with pytest.raises(Exception):
             write_file("mock-file", "mock-content", mode="w")