circfirm 5.1.0__tar.gz → 5.1.1__tar.gz

{circfirm-5.1.0 → circfirm-5.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: circfirm
-Version: 5.1.0
+Version: 5.1.1
 Summary: CLI tool for install firmware for CircuitPython boards
 Author-email: Alec Delaney <tekktrik@gmail.com>
 License: MIT

circfirm-5.1.1/VERSION

@@ -0,0 +1 @@
+5.1.1

{circfirm-5.1.0 → circfirm-5.1.1}/circfirm/cli/__init__.py

@@ -17,6 +17,7 @@ from typing import Any, TypeVar
 
 import click
 import click_spinner
+import requests
 import yaml
 
 import circfirm
@@ -103,9 +104,10 @@ def download_if_needed(board: str, version: str, language: str) -> None:
                 circfirm.backend.cache.download_uf2,
                 args=(board, version, language),
             )
-        except ConnectionError as err:
+        except (ConnectionError, requests.exceptions.ConnectionError) as err:
             click.echo(" failed")  # Mark as failed
-            click.echo(f"Error: {err.args[0]}")
+            if isinstance(err, ConnectionError):
+                click.echo(f"Error: {err.args[0]}")
             sys.exit(4)
     else:
         click.echo("Using cached firmware file")

{circfirm-5.1.0 → circfirm-5.1.1}/circfirm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: circfirm
-Version: 5.1.0
+Version: 5.1.1
 Summary: CLI tool for install firmware for CircuitPython boards
 Author-email: Alec Delaney <tekktrik@gmail.com>
 License: MIT

{circfirm-5.1.0 → circfirm-5.1.1}/circfirm.egg-info/SOURCES.txt

@@ -107,6 +107,7 @@ tests/backend/test_backend_cache.py
 tests/backend/test_backend_device.py
 tests/backend/test_backend_github.py
 tests/backend/test_backend_s3.py
+tests/cli/test_cli.py
 tests/cli/test_cli_about.py
 tests/cli/test_cli_cache.py
 tests/cli/test_cli_config.py

circfirm-5.1.1/tests/cli/test_cli.py

@@ -0,0 +1,72 @@
+# SPDX-FileCopyrightText: 2026 Alec Delaney
+# SPDX-License-Identifier: MIT
+
+"""Tests the core CLI functionality.
+
+Author(s): Alec Delaney
+"""
+
+import shutil
+from typing import NoReturn
+
+import pytest
+
+import circfirm.backend.cache
+import circfirm.cli
+
+BOARD = "feather_m0_express"
+LANGUAGE = "cs"
+VERSION = "6.1.0"
+
+
+@pytest.mark.parametrize(
+    "cached",
+    (
+        (True,),
+        (False,),
+    ),
+)
+def test_download_if_needed_cached(
+    monkeypatch: pytest.MonkeyPatch,
+    cached: bool,
+) -> None:
+    """Tests the install command when there is a cached firmware and has internet."""
+    monkeypatch.setattr(
+        circfirm.backend.cache, "is_downloaded", lambda _x, _y, _z: cached
+    )
+    try:
+        circfirm.cli.download_if_needed(BOARD, VERSION, LANGUAGE)
+    finally:
+        board_folder = circfirm.backend.cache.get_board_folder(BOARD)
+        if board_folder.exists():  # pragma: no cover
+            shutil.rmtree(board_folder)
+
+
+@pytest.mark.parametrize(
+    "cached,succeeds",
+    (
+        (True, True),
+        (False, False),
+    ),
+)
+def test_download_if_needed_cached_no_internet(
+    monkeypatch: pytest.MonkeyPatch,
+    mock_no_internet: NoReturn,
+    cached: bool,
+    succeeds: bool,
+) -> None:
+    """Tests the install command when there is a cached firmware but no internet."""
+    monkeypatch.setattr(
+        circfirm.backend.cache, "is_downloaded", lambda _x, _y, _z: cached
+    )
+
+    try:
+        if succeeds:
+            circfirm.cli.download_if_needed(BOARD, VERSION, LANGUAGE)
+        else:
+            with pytest.raises(SystemExit):
+                circfirm.cli.download_if_needed(BOARD, VERSION, LANGUAGE)
+    finally:
+        board_folder = circfirm.backend.cache.get_board_folder(BOARD)
+        if board_folder.exists():  # pragma: no cover
+            shutil.rmtree(board_folder)

{circfirm-5.1.0 → circfirm-5.1.1}/tests/cli/test_cli_cache.py

@@ -273,7 +273,7 @@ def test_cache_latest() -> None:
             shutil.rmtree(board_folder)
 
 
-def test_cache_latest_no_internet(mock_s3_no_internet: NoReturn) -> None:
+def test_cache_latest_no_internet(mock_no_internet: NoReturn) -> None:
     """Test the update command when in CIRCUITPY mode when there is no internet connection."""
     board = "feather_m0_express"
     language = "cs"

{circfirm-5.1.0 → circfirm-5.1.1}/tests/cli/test_cli_query.py

@@ -69,9 +69,7 @@ def test_query_board_ids_bad_token(token: None) -> None:
     assert result.exit_code != 0
 
 
-def test_query_board_ids_no_internet(
-    token: None, mock_requests_no_internet: NoReturn
-) -> None:
+def test_query_board_ids_no_internet(token: None, mock_no_internet: NoReturn) -> None:
     """Tests failure when cannot fetch results due to no network connection."""
     result = RUNNER.invoke(cli, ["query", "board-ids"])
     assert result.exit_code != 0
@@ -124,7 +122,7 @@ def test_query_versions() -> None:
     assert result.output == "6.2.0-beta.1\n"
 
 
-def test_query_versions_no_internet(mock_s3_no_internet: NoReturn) -> None:
+def test_query_versions_no_internet(mock_no_internet: NoReturn) -> None:
     """Tests the ability to query firmware versions using the CLI."""
     board = "adafruit_feather_rp2040"
     language = "cs"
@@ -180,7 +178,7 @@ def test_query_latest() -> None:
     assert result.output == expected_output
 
 
-def test_query_latest_no_internet(mock_s3_no_internet: NoReturn) -> None:
+def test_query_latest_no_internet(mock_no_internet: NoReturn) -> None:
     """Tests the ability to query the latest version of the firmware using the CLI."""
     board = "adafruit_feather_rp2040"
     language = "cs"

{circfirm-5.1.0 → circfirm-5.1.1}/tests/cli/test_cli_update.py

@@ -46,9 +46,7 @@ def test_update(mock_with_circuitpy: None) -> None:
             shutil.rmtree(board_folder)
 
 
-def test_update_no_internet(
-    mock_s3_no_internet: None, mock_with_circuitpy: None
-) -> None:
+def test_update_no_internet(mock_no_internet: None, mock_with_circuitpy: None) -> None:
     """Test the update command when in CIRCUITPY mode."""
     try:
         tests.helpers.set_firmware_version(ORIGINAL_VERSION)

{circfirm-5.1.0 → circfirm-5.1.1}/tests/conftest.py

@@ -120,25 +120,19 @@ def mock_with_firmwares_archived() -> Iterator[None]:
 
 
 @pytest.fixture
-def mock_requests_no_internet(monkeypatch: pytest.MonkeyPatch) -> NoReturn:
+def mock_no_internet(monkeypatch: pytest.MonkeyPatch) -> NoReturn:
     """Simulate a network error by raising requests.ConnectionError."""
 
-    def mock_get(*args, **kwargs) -> NoReturn:
+    def mock_requests_get(*args, **kwargs) -> NoReturn:
         """Mock GET function."""
         raise requests.ConnectionError
 
-    monkeypatch.setattr(requests, "get", mock_get)
-
-
-@pytest.fixture
-def mock_s3_no_internet(monkeypatch: pytest.MonkeyPatch) -> None:
-    """Monkeypatch for an S3 command run without an internet connection."""
-
-    def mock_send(self, *args, **kwargs) -> NoReturn:
+    def mock_urllib3session_send(self, *args, **kwargs) -> NoReturn:
         """Mock send method."""
         raise botocore.exceptions.EndpointConnectionError(endpoint_url="test")
 
-    monkeypatch.setattr(URLLib3Session, "send", mock_send)
+    monkeypatch.setattr(requests, "get", mock_requests_get)
+    monkeypatch.setattr(URLLib3Session, "send", mock_urllib3session_send)
 
 
 # Fixtures for working with GitHub tokens in settings file

{circfirm-5.1.0 → circfirm-5.1.1}/tests/helpers.py

@@ -71,9 +71,9 @@ def delete_mount_node(path: str, missing_ok: bool = False) -> None:
 
 def _copy_text_file(filename: str) -> None:
     """Copy a text file to the mounted test drive."""
-    template_bootloader = os.path.join("tests", "assets", filename)
-    bootloader_dest = os.path.join(get_mount(), filename)
-    shutil.copyfile(template_bootloader, bootloader_dest)
+    template_file = os.path.join("tests", "assets", filename)
+    mount_dest = os.path.join(get_mount(), filename)
+    shutil.copyfile(template_file, mount_dest)
 
 
 def copy_uf2_info() -> None:

circfirm-5.1.0/VERSION

@@ -1 +0,0 @@
-5.1.0