circup 2.4.0__tar.gz → 3.0.0__tar.gz

{circup-2.4.0/circup.egg-info → circup-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: circup
-Version: 2.4.0
+Version: 3.0.0
 Summary: A tool to manage/update libraries on CircuitPython devices.
 Author-email: Adafruit Industries <circuitpython@adafruit.com>
 License: MIT License
@@ -42,7 +42,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Education
 Classifier: Topic :: Software Development :: Embedded Systems
 Classifier: Topic :: System :: Software Distribution
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: appdirs

{circup-2.4.0 → circup-3.0.0}/circup/backends.py

@@ -139,7 +139,7 @@ class Backend:
             if name in device_modules:
                 if not upgrade:
                     # skip already installed modules if no -upgrade flag
-                    click.echo("'{}' is already installed.".format(name))
+                    click.echo(f"'{name}' is already installed.")
                     return
 
                 # uninstall the module before installing
@@ -207,9 +207,9 @@ class Backend:
                     self.install_module_mpy(bundle, metadata)
             else:
                 self.copy_file(metadata["path"], "lib")
-            click.echo("Installed '{}'.".format(name))
+            click.echo(f"Installed '{name}'.")
         else:
-            click.echo("Unknown module named, '{}'.".format(name))
+            click.echo(f"Unknown module named, '{name}'.")
 
     # def libraries_from_imports(self, code_py, mod_names):
     #     """
@@ -305,7 +305,7 @@ class WebBackend(Backend):
             socket.getaddrinfo(host, 80, proto=socket.IPPROTO_TCP)
         except socket.gaierror as exc:
             raise RuntimeError(
-                "Invalid host: {}.".format(host) + " You should remove the 'http://'"
+                f"Invalid host: {host}." + " You should remove the 'http://'"
                 if "http://" in host or "https://" in host
                 else "Could not find or connect to specified device"
             ) from exc
@@ -659,7 +659,7 @@ class WebBackend(Backend):
             self.install_file_http(bundle_path)
 
         else:
-            raise IOError("Cannot find compiled version of module.")
+            raise OSError("Cannot find compiled version of module.")
 
     # pylint: enable=too-many-locals,too-many-branches
     def install_module_py(self, metadata, location=None):
@@ -862,7 +862,6 @@ class DiskBackend(Backend):
             try:
                 with open(
                     os.path.join(self.device_location, "boot_out.txt"),
-                    "r",
                     encoding="utf-8",
                 ) as boot:
                     boot_out_contents = boot.read()
@@ -934,7 +933,7 @@ class DiskBackend(Backend):
             # Copy file.
             shutil.copyfile(bundle_path, target_path)
         else:
-            raise IOError("Cannot find compiled version of module.")
+            raise OSError("Cannot find compiled version of module.")
 
     # pylint: enable=too-many-locals,too-many-branches
     def install_module_py(self, metadata, location=None):

{circup-2.4.0 → circup-3.0.0}/circup/bundle.py

@@ -109,7 +109,7 @@ class Bundle:  # pylint: disable=too-many-instance-attributes
             "requirements.txt" if not toml_file else "pyproject.toml",
         )
         if os.path.isfile(found_file):
-            with open(found_file, "r", encoding="utf-8") as read_this:
+            with open(found_file, encoding="utf-8") as read_this:
                 return read_this.read()
         return None
 

{circup-2.4.0 → circup-3.0.0}/circup/command_utils.py

@@ -329,7 +329,7 @@ def find_device():
         old_mode = ctypes.windll.kernel32.SetErrorMode(1)
         try:
             for disk in "ABCDEFGHIJKLMNOPQRSTUVWXYZ":
-                path = "{}:\\".format(disk)
+                path = f"{disk}:\\"
                 if os.path.exists(path) and get_volume_name(path) == "CIRCUITPY":
                     device_dir = path
                     # Report only the FIRST device found.
@@ -338,7 +338,7 @@ def find_device():
             ctypes.windll.kernel32.SetErrorMode(old_mode)
     else:
         # No support for unknown operating systems.
-        raise NotImplementedError('OS "{}" not supported.'.format(os.name))
+        raise NotImplementedError(f'OS "{os.name}" not supported.')
     logger.info("Found device: %s", device_dir)
     return device_dir
 
@@ -392,7 +392,7 @@ def find_modules(backend, bundles_list):
         # If it's not possible to get the device and bundle metadata, bail out
         # with a friendly message and indication of what's gone wrong.
         logger.exception(ex)
-        click.echo("There was a problem: {}".format(ex))
+        click.echo(f"There was a problem: {ex}")
         sys.exit(1)
     # pylint: enable=broad-except,too-many-locals
 
@@ -454,7 +454,7 @@ def get_bundle_examples(bundles_list, avoid_download=False):
             path = bundle.examples_dir(source=True)
             meta_saved = os.path.join(path, "../bundle_examples.json")
             if os.path.exists(meta_saved):
-                with open(meta_saved, "r", encoding="utf-8") as f:
+                with open(meta_saved, encoding="utf-8") as f:
                     bundle_examples = json.load(f)
                 all_the_examples.update(bundle_examples)
                 bundle_examples.clear()
@@ -929,7 +929,7 @@ def libraries_from_auto_file(backend, auto_file, mod_names):
     # pass a local file with "./" or "../"
     is_relative = auto_file.split(os.sep)[0] in [os.path.curdir, os.path.pardir]
     if os.path.isabs(auto_file) or is_relative:
-        with open(auto_file, "r", encoding="UTF8") as fp:
+        with open(auto_file, encoding="UTF8") as fp:
             auto_file_content = fp.read()
     else:
         auto_file_content = backend.get_file_content(auto_file)

{circup-2.4.0 → circup-3.0.0}/circup/commands.py

@@ -196,7 +196,7 @@ def main(  # pylint: disable=too-many-locals
         verbose_handler.setLevel(logging.INFO)
         verbose_handler.setFormatter(log_formatter)
         logger.addHandler(verbose_handler)
-        click.echo("Logging to {}\n".format(LOGFILE))
+        click.echo(f"Logging to {LOGFILE}\n")
     else:
         ctx.obj["verbose"] = False
 
@@ -253,7 +253,7 @@ def main(  # pylint: disable=too-many-locals
                     url_download = f"https://circuitpython.org/board/{board_id}"
                 else:
                     url_download = "https://circuitpython.org/downloads"
-                click.secho("Get it here: {}".format(url_download), fg="green")
+                click.secho(f"Get it here: {url_download}", fg="green")
         except ValueError as ex:
             logger.warning("CircuitPython has incorrect semver value.")
             logger.warning(ex)
@@ -291,7 +291,7 @@ def freeze(ctx, requirement):  # pragma: no cover
     if modules:
         output = []
         for module in modules:
-            output.append("{}=={}".format(module.name, module.device_version))
+            output.append(f"{module.name}=={module.device_version}")
         for module in output:
             click.echo(module)
             logger.info(module)
@@ -350,7 +350,7 @@ def list_cli(ctx):  # pragma: no cover
         for row in data:
             for i, word in enumerate(row):
                 col_width[i] = max(len(word) + 2, col_width[i])
-        dashes = tuple(("-" * (width - 1) for width in col_width))
+        dashes = tuple("-" * (width - 1) for width in col_width)
         data.insert(1, dashes)
         click.echo(
             "The following modules are out of date or probably need an update.\n"
@@ -424,7 +424,7 @@ def install(
     for module, metadata in available_modules.items():
         mod_names[module.replace(".py", "").lower()] = metadata
     if requirement:
-        with open(requirement, "r", encoding="utf-8") as rfile:
+        with open(requirement, encoding="utf-8") as rfile:
             requirements_txt = rfile.read()
         requested_installs = libraries_from_requirements(requirements_txt)
     elif auto or auto_file:
@@ -585,9 +585,7 @@ def show(ctx, match):  # pragma: no cover
         module_names = [m for m in module_names if match in m]
     click.echo("\n".join(module_names))
 
-    click.echo(
-        "{} shown of {} packages.".format(len(module_names), len(available_modules))
-    )
+    click.echo(f"{len(module_names)} shown of {len(available_modules)} packages.")
 
 
 @main.command()
@@ -611,9 +609,9 @@ def uninstall(ctx, module):  # pragma: no cover
             metadata = mod_names[name]
             module_path = metadata["path"]
             ctx.obj["backend"].uninstall(device_path, module_path)
-            click.echo("Uninstalled '{}'.".format(name))
+            click.echo(f"Uninstalled '{name}'.")
         else:
-            click.echo("Module '{}' not found on device.".format(name))
+            click.echo(f"Module '{name}' not found on device.")
         continue
 
 
@@ -653,7 +651,7 @@ def update(ctx, update_all):  # pragma: no cover
 
     # Process out of date modules
     updated_modules = []
-    click.echo("Found {} module[s] needing update.".format(len(modules_to_update)))
+    click.echo(f"Found {len(modules_to_update)} module[s] needing update.")
     if not update_all:
         click.echo("Please indicate which module[s] you wish to update:\n")
     for module in modules_to_update:
@@ -692,22 +690,20 @@ def update(ctx, update_all):  # pragma: no cover
                 update_flag = click.confirm("Do you want to update?")
             elif module.major_update:
                 update_flag = click.confirm(
-                    (
-                        "'{}' is a Major Version update and may contain breaking "
-                        "changes. Do you want to update?".format(module.name)
-                    )
+                    "'{}' is a Major Version update and may contain breaking "
+                    "changes. Do you want to update?".format(module.name)
                 )
             else:
-                update_flag = click.confirm("Update '{}'?".format(module.name))
+                update_flag = click.confirm(f"Update '{module.name}'?")
         if update_flag:
             # pylint: disable=broad-except
             try:
                 ctx.obj["backend"].update(module)
                 updated_modules.append(module.name)
-                click.echo("Updated {}".format(module.name))
+                click.echo(f"Updated {module.name}")
             except Exception as ex:
                 logger.exception(ex)
-                click.echo("Something went wrong, {} (check the logs)".format(str(ex)))
+                click.echo(f"Something went wrong, {str(ex)} (check the logs)")
             # pylint: enable=broad-except
 
     if not updated_modules:

{circup-2.4.0 → circup-3.0.0}/circup/lazy_metadata.py

@@ -5,7 +5,8 @@
 Class that acts similar to a dictionary, but defers the loading of expensive
 data until that data is accessed.
 """
-from typing import Any, Callable
+from typing import Any
+from collections.abc import Callable
 
 
 class LazyMetadata:

{circup-2.4.0 → circup-3.0.0}/circup/shared.py

@@ -134,7 +134,7 @@ def extract_metadata(path, logger):
     logger.info("%s", path)
     if path.endswith(".py"):
         result["mpy"] = False
-        with open(path, "r", encoding="utf-8") as source_file:
+        with open(path, encoding="utf-8") as source_file:
             content = source_file.read()
         #: The regex used to extract ``__version__`` and ``__repo__`` assignments.
         dunder_key_val = r"""(__\w+__)(?:\s*:\s*\w+)?\s*=\s*(?:['"]|\(\s)(.+)['"]"""

{circup-2.4.0 → circup-3.0.0}/circup/wwshell/commands.py

@@ -115,7 +115,7 @@ def main(  # pylint: disable=too-many-locals
         verbose_handler.setLevel(logging.INFO)
         verbose_handler.setFormatter(log_formatter)
         logger.addHandler(verbose_handler)
-        click.echo("Logging to {}\n".format(LOGFILE))
+        click.echo(f"Logging to {LOGFILE}\n")
     else:
         ctx.obj["verbose"] = False
 
@@ -137,7 +137,7 @@ def main(  # pylint: disable=too-many-locals
         click.secho("Could not find a connected CircuitPython device.", fg="red")
         sys.exit(1)
     else:
-        click.echo("Found device at {}.".format(device_path))
+        click.echo(f"Found device at {device_path}.")
 
 
 @main.command("ls")

{circup-2.4.0 → circup-3.0.0/circup.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: circup
-Version: 2.4.0
+Version: 3.0.0
 Summary: A tool to manage/update libraries on CircuitPython devices.
 Author-email: Adafruit Industries <circuitpython@adafruit.com>
 License: MIT License
@@ -42,7 +42,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Education
 Classifier: Topic :: Software Development :: Embedded Systems
 Classifier: Topic :: System :: Software Distribution
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: appdirs

{circup-2.4.0 → circup-3.0.0}/pyproject.toml

@@ -32,7 +32,7 @@ classifiers = [
 ]
 keywords = ["adafruit", "blinka", "circuitpython", "micropython", "libraries"]
 
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 
 [tool.setuptools.dynamic]
 dependencies = {file = ["requirements.txt"]}

{circup-2.4.0 → circup-3.0.0}/tests/test_circup.py

@@ -680,7 +680,7 @@ def test_extract_metadata_python():
         "builtins.open", mock.mock_open(read_data=code)
     ) as mock_open, mock.patch("circup.logger.warning") as mock_logger:
         result = circup.extract_metadata(path, mock_logger)
-        mock_open.assert_called_once_with(path, "r", encoding="utf-8")
+        mock_open.assert_called_once_with(path, encoding="utf-8")
     assert len(result) == 3
     assert result["__version__"] == "1.1.4"
     assert result["__repo__"] == "https://github.com/adafruit/SomeLibrary.git"
@@ -1209,7 +1209,7 @@ def test_show_match_py_command():
 def test_imports_from_code():
     """Ensure that various styles of import all work"""
     test_file = str(pathlib.Path(__file__).parent / "import_styles.py")
-    with open(test_file, "r", encoding="utf8") as fp:
+    with open(test_file, encoding="utf8") as fp:
         test_data = fp.read()
 
     result = imports_from_code(test_data)
@@ -1256,7 +1256,7 @@ def test_get_all_imports():
         backend = DiskBackend(tests_dir / "mock_device", mock_logger)
 
         test_file = str(tests_dir / "import_styles.py")
-        with open(test_file, "r", encoding="utf8") as fp:
+        with open(test_file, encoding="utf8") as fp:
             test_data = fp.read()
 
         result = get_all_imports(