circfirm 4.0.0__py3-none-any.whl → 4.0.1__py3-none-any.whl

circfirm/backend/cache.py

@@ -15,7 +15,6 @@ import packaging.version
 import requests
 
 import circfirm.backend
-import circfirm.startup
 
 
 def get_uf2_filepath(

circfirm/backend/s3.py

@@ -17,7 +17,6 @@ import packaging.version
 from mypy_boto3_s3 import S3ServiceResource
 
 import circfirm.backend
-import circfirm.backend.cache
 
 S3_CONFIG = botocore.client.Config(signature_version=botocore.UNSIGNED)
 S3_RESOURCE: S3ServiceResource = boto3.resource("s3", config=S3_CONFIG)

circfirm/cli/cache.py

@@ -13,6 +13,7 @@ import re
 import shutil
 from typing import Optional
 
+import botocore.exceptions
 import click
 
 import circfirm
@@ -153,3 +154,7 @@ def cache_latest(board_id: str, language: str, pre_release: bool) -> None:
         )
     except ConnectionError as err:
         raise click.exceptions.ClickException(err.args[0])
+    except botocore.exceptions.ConnectionError:
+        raise click.exceptions.ClickException(
+            "Could not connect to the S3 bucket - check network connection"
+        )

circfirm/cli/query.py

@@ -9,6 +9,7 @@ Author(s): Alec Delaney
 
 import re
 
+import botocore.exceptions
 import click
 import requests
 
@@ -51,12 +52,18 @@ def query_board_ids(regex: str) -> None:
     except ValueError as err:
         raise click.ClickException(err.args[0])
     except requests.ConnectionError as err:
+        print("Triggered!")
         raise click.ClickException(
             "Issue with requesting information from git repository, check network connection"
         )
     for board in boards:
         board_id = board.strip()
-        result = re.search(regex, board_id)
+        try:
+            result = re.search(regex, board_id)
+        except re.PatternError:
+            raise click.exceptions.ClickException(
+                "Regex pattern error - please check the regex syntax"
+            )
         if result:
             click.echo(board_id)
 
@@ -69,7 +76,16 @@ def query_board_ids(regex: str) -> None:
 )
 def query_versions(board_id: str, language: str, regex: str) -> None:
     """Query the CircuitPython versions available for a board."""
-    versions = circfirm.backend.s3.get_board_versions(board_id, language, regex=regex)
+    try:
+        versions = circfirm.backend.s3.get_board_versions(
+            board_id, language, regex=regex
+        )
+    except botocore.exceptions.ConnectionError as err:
+        raise click.exceptions.ClickException(err.args[0])
+    except re.PatternError:
+        raise click.exceptions.ClickException(
+            "Regex pattern error - please check the regex syntax"
+        )
     for version in reversed(versions):
         click.echo(version)
 
@@ -86,8 +102,11 @@ def query_versions(board_id: str, language: str, regex: str) -> None:
 )
 def query_latest(board_id: str, language: str, pre_release: bool) -> None:
     """Query the latest CircuitPython versions available."""
-    version = circfirm.backend.s3.get_latest_board_version(
-        board_id, language, pre_release
-    )
+    try:
+        version = circfirm.backend.s3.get_latest_board_version(
+            board_id, language, pre_release
+        )
+    except botocore.exceptions.ConnectionError as err:
+        raise click.exceptions.ClickException(err.args[0])
     if version:
         click.echo(version)

circfirm/cli/update.py

@@ -9,12 +9,12 @@ Author(s): Alec Delaney
 
 from typing import Optional
 
+import botocore.exceptions
 import click
 import packaging.version
 
 import circfirm.backend.device
 import circfirm.backend.s3
-import circfirm.cli.install
 
 
 @click.command()
@@ -79,7 +79,10 @@ def cli(  # noqa: PLR0913
     except OSError as err:
         raise click.ClickException(err.args[0])
 
-    new_versions = circfirm.backend.s3.get_board_versions(board_id, language)
+    try:
+        new_versions = circfirm.backend.s3.get_board_versions(board_id, language)
+    except botocore.exceptions.ConnectionError as err:
+        raise click.exceptions.ClickException(err.args[0])
 
     if not pre_release:
         new_versions = [

{circfirm-4.0.0.dist-info → circfirm-4.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: circfirm
-Version: 4.0.0
+Version: 4.0.1
 Summary: CLI tool for install firmware for CircuitPython boards
 Author-email: Alec Delaney <tekktrik@gmail.com>
 License: MIT
@@ -46,6 +46,7 @@ Requires-Dist: pytest~=8.3; extra == "dev"
 Requires-Dist: sphinx~=7.4; extra == "dev"
 Requires-Dist: sphinx-tabs~=3.4; extra == "dev"
 Requires-Dist: sphinx-rtd-theme~=3.0; extra == "dev"
+Dynamic: license-file
 
 ..
    SPDX-FileCopyrightText: 2022 Alec Delaney, for Adafruit Industries

{circfirm-4.0.0.dist-info → circfirm-4.0.1.dist-info}/RECORD

@@ -2,26 +2,26 @@ circfirm/__init__.py,sha256=Uk6XRo7aFQcwUOMfst4GVt8tuXbMRnDIsPRrWeBtxLQ,719
 circfirm/py.typed,sha256=F2H7kdQErBIQUjr5WG2gdwj35iaUHi4Eyc2hovaLTMA,97
 circfirm/startup.py,sha256=HoeMpISAJswKTFn-sHhtoCD5yISHW5z8ZPW7WgSr2xg,1946
 circfirm/backend/__init__.py,sha256=fzxooHsys60iPrj6q6l-t3m2iGAC6FEIinP1UFgGHKE,1858
-circfirm/backend/cache.py,sha256=cxd_Za68SotnQ4td9R3-_F20Rci5BMVO1LgD0CVpKRo,2931
+circfirm/backend/cache.py,sha256=WZwBP-c9KkTX5IpkRovj46FUzk6JJdFB8-FIWC3--5k,2907
 circfirm/backend/device.py,sha256=t_g4iPJ4C2Qg5xKUr1AI6XPu5-ULTDZ4e3qAZVSfJs8,1776
 circfirm/backend/github.py,sha256=ePHXTCxqGcJOyVsutdbsL80MaxIYBdNIV9Yzz8aG4Yg,2090
-circfirm/backend/s3.py,sha256=eTwCD79E8TCia2kPcj1-p7qmIvTt2vqQC_K7mHKWeyk,2175
+circfirm/backend/s3.py,sha256=rFxR4XcP9njGcAe3FikJmcvaJHmgFFCqGRSqHD3lqDE,2145
 circfirm/cli/__init__.py,sha256=TBJxvMqzTXQNEv2jKTZHqxeTTvGoQ9sz4o4R91Qe4Kg,6454
 circfirm/cli/about.py,sha256=_QNqXtbyerlxewPVieCdOvQ6BZWqdgvncBIzj39zpCU,340
-circfirm/cli/cache.py,sha256=z1DtWFusGAeUnzFTl0dcxyko7eOQmJUyR1x3orfEWk8,5222
+circfirm/cli/cache.py,sha256=fpwktpS7e0Ikg8qekUoC40qHHARcShiLuxSW7ZIqg5I,5430
 circfirm/cli/config.py,sha256=9ye3jQhgXaOMAXIlJWHp8PhBEtjUTJSL9szTXCQU2Cg,3122
 circfirm/cli/current.py,sha256=3kjvAQ5oFuXxey8RtU6T5GJPnTmIy2saEpyYoqVOTU8,1034
 circfirm/cli/detect.py,sha256=hXOIFjQAylx5kDT1chU2HJXqIv14scDJheO5-XUioeI,944
 circfirm/cli/install.py,sha256=z0pT7J_n4A3dJn-ocZk-uYcKkOZ3iUHbId-f-k97cg0,1253
-circfirm/cli/query.py,sha256=628UQhQxUMoTnKwPJhhL0ZjmKR_zNJTFgq-PzV-SPlM,2959
-circfirm/cli/update.py,sha256=S25Cty4HXy71hQvAXbxP_JNN_2JgcvXxfocte0rzMWE,3433
+circfirm/cli/query.py,sha256=hZMzxojZUNr7eNCj5dz9WY2u9DTXov21PnRcYcPhkQ4,3633
+circfirm/cli/update.py,sha256=ZXLjUmpaJCvEI19rafCzGIco3wJZ-zCB4YpYxb7Iciw,3559
 circfirm/templates/settings.yaml,sha256=SM1zjXvZg1jikzn9TjgOufl0Pn9KBbrw8sIcJ01BRhQ,69
 circfirm/templates/settings.yaml.license,sha256=F2H7kdQErBIQUjr5WG2gdwj35iaUHi4Eyc2hovaLTMA,97
-circfirm-4.0.0.dist-info/LICENSE,sha256=6pPP6gJ00tqCkxg5gABHDwWUiXZ_mBzH94xxPOqwGj4,1069
-circfirm-4.0.0.dist-info/METADATA,sha256=vedVLmckngt1DSxN0IUD9q5c_NujIfxih9JTUg0ktok,4678
-circfirm-4.0.0.dist-info/NOTICE,sha256=-iTImDmAffekkp_kj8De0_pvckHvXAHLPAJTWOgQsiw,2956
-circfirm-4.0.0.dist-info/NOTICE.license,sha256=FIvC5TnLXwPBj-dgEV4FBwAlJxzMXhgl50TXLv2d88o,96
-circfirm-4.0.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-circfirm-4.0.0.dist-info/entry_points.txt,sha256=33qZTmSuXz8dgi29yjSyb8VsEA8HyhWuhn2MNcjatGQ,46
-circfirm-4.0.0.dist-info/top_level.txt,sha256=qA2407wap3My6jGA5uchH2JjUM7qn73oBPwALN7GR5k,9
-circfirm-4.0.0.dist-info/RECORD,,
+circfirm-4.0.1.dist-info/licenses/LICENSE,sha256=6pPP6gJ00tqCkxg5gABHDwWUiXZ_mBzH94xxPOqwGj4,1069
+circfirm-4.0.1.dist-info/licenses/NOTICE,sha256=-iTImDmAffekkp_kj8De0_pvckHvXAHLPAJTWOgQsiw,2956
+circfirm-4.0.1.dist-info/licenses/NOTICE.license,sha256=FIvC5TnLXwPBj-dgEV4FBwAlJxzMXhgl50TXLv2d88o,96
+circfirm-4.0.1.dist-info/METADATA,sha256=trxEBd0QhzT8ETbp7ce6R_8J0E1pHRUKjIx-_9TvY24,4700
+circfirm-4.0.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+circfirm-4.0.1.dist-info/entry_points.txt,sha256=33qZTmSuXz8dgi29yjSyb8VsEA8HyhWuhn2MNcjatGQ,46
+circfirm-4.0.1.dist-info/top_level.txt,sha256=qA2407wap3My6jGA5uchH2JjUM7qn73oBPwALN7GR5k,9
+circfirm-4.0.1.dist-info/RECORD,,

{circfirm-4.0.0.dist-info → circfirm-4.0.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any