circfirm 2.0.0__tar.gz → 2.0.2__tar.gz

{circfirm-2.0.0 → circfirm-2.0.2}/PKG-INFO

@@ -1,20 +1,25 @@
 Metadata-Version: 2.1
 Name: circfirm
-Version: 2.0.0
+Version: 2.0.2
 Summary: CLI tool for install firmware for CircuitPython boards
 Author-email: Alec Delaney <tekktrik@gmail.com>
 License: MIT
-Project-URL: Homepage, https://github.com/tekktrik/circlink
-Project-URL: Repository, https://github.com/tekktrik/circlink.git
+Project-URL: Homepage, https://github.com/tekktrik/circfirm
+Project-URL: Repository, https://github.com/tekktrik/circfirm.git
 Keywords: adafruit,circuitpython,tool,cli,firmware,install,upload
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Embedded Systems
 Classifier: Topic :: System :: Hardware
 Classifier: License :: OSI Approved :: MIT License
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Operating System :: Unix
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: MacOS

circfirm-2.0.2/VERSION

@@ -0,0 +1 @@
+2.0.2

{circfirm-2.0.0 → circfirm-2.0.2}/circfirm/cli.py

@@ -34,9 +34,15 @@ def cli() -> None:
 @click.option("-b", "--board", default=None, help="Assume the given board name")
 def install(version: str, language: str, board: Optional[str]) -> None:
     """Install the specified version of CircuitPython."""
+    circuitpy = circfirm.backend.find_circuitpy()
+    bootloader = circfirm.backend.find_bootloader()
+    if not circuitpy and not bootloader:
+        click.echo("CircuitPython device not found!")
+        click.echo("Check that the device is connected and mounted.")
+        sys.exit(1)
+
     if not board:
-        circuitpy = circfirm.backend.find_circuitpy()
-        if not circuitpy and circfirm.backend.find_bootloader():
+        if not circuitpy and bootloader:
             click.echo("CircuitPython device found, but it is in bootloader mode!")
             click.echo(
                 "Please put the device out of bootloader mode, or use the --board option."
@@ -45,20 +51,14 @@ def install(version: str, language: str, board: Optional[str]) -> None:
         board = circfirm.backend.get_board_name(circuitpy)
 
         click.echo("Board name detected, please switch the device to bootloader mode.")
-        while not circfirm.backend.find_bootloader():
+        while not (bootloader := circfirm.backend.find_bootloader()):
             time.sleep(1)
 
-    mount_path = circfirm.backend.find_bootloader()
-    if not mount_path:
-        circuitpy = circfirm.backend.find_circuitpy()
-        if circuitpy:
+    if not bootloader:
+        if circfirm.backend.find_circuitpy():
             click.echo("CircuitPython device found, but is not in bootloader mode!")
             click.echo("Please put the device in bootloader mode.")
             sys.exit(2)
-        else:
-            click.echo("CircuitPython device not found!")
-            click.echo("Check that the device is connected and mounted.")
-            sys.exit(1)
 
     if not circfirm.backend.is_downloaded(board, version, language):
         click.echo("Downloading UF2...")
@@ -66,7 +66,7 @@ def install(version: str, language: str, board: Optional[str]) -> None:
 
     uf2file = circfirm.backend.get_uf2_filepath(board, version, language)
     uf2filename = os.path.basename(uf2file)
-    shutil.copyfile(uf2file, os.path.join(mount_path, uf2filename))
+    shutil.copyfile(uf2file, os.path.join(bootloader, uf2filename))
     click.echo("UF2 file copied to device!")
     click.echo("Device should reboot momentarily.")
 

{circfirm-2.0.0 → circfirm-2.0.2}/circfirm.egg-info/PKG-INFO

@@ -1,20 +1,25 @@
 Metadata-Version: 2.1
 Name: circfirm
-Version: 2.0.0
+Version: 2.0.2
 Summary: CLI tool for install firmware for CircuitPython boards
 Author-email: Alec Delaney <tekktrik@gmail.com>
 License: MIT
-Project-URL: Homepage, https://github.com/tekktrik/circlink
-Project-URL: Repository, https://github.com/tekktrik/circlink.git
+Project-URL: Homepage, https://github.com/tekktrik/circfirm
+Project-URL: Repository, https://github.com/tekktrik/circfirm.git
 Keywords: adafruit,circuitpython,tool,cli,firmware,install,upload
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Embedded Systems
 Classifier: Topic :: System :: Hardware
 Classifier: License :: OSI Approved :: MIT License
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Operating System :: Unix
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: MacOS

{circfirm-2.0.0 → circfirm-2.0.2}/pyproject.toml

@@ -32,10 +32,15 @@ classifiers = [
     "Topic :: Software Development :: Embedded Systems",
     "Topic :: System :: Hardware",
     "License :: OSI Approved :: MIT License",
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Console",
+    "Natural Language :: English",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: Implementation :: CPython",
     "Operating System :: Unix",
     "Operating System :: Microsoft :: Windows",
     "Operating System :: MacOS",
@@ -43,8 +48,8 @@ classifiers = [
 dynamic = ["version", "dependencies", "optional-dependencies"]
 
 [project.urls]
-Homepage = "https://github.com/tekktrik/circlink"
-Repository = "https://github.com/tekktrik/circlink.git"
+Homepage = "https://github.com/tekktrik/circfirm"
+Repository = "https://github.com/tekktrik/circfirm.git"
 
 [project.scripts]
 circfirm = "circfirm.cli:cli"

circfirm-2.0.0/VERSION

@@ -1 +0,0 @@
-2.0.0