circup 1.8.0__tar.gz → 2.0.1__tar.gz

{circup-1.8.0 → circup-2.0.1}/.github/workflows/build.yml

@@ -17,10 +17,10 @@ jobs:
     - name: Translate Repo Name For Build Tools filename_prefix
       id: repo-name
       run: echo ::set-output name=repo-name::circup
-    - name: Set up Python 3.7
+    - name: Set up Python 3.11
       uses: actions/setup-python@v1
       with:
-        python-version: 3.7
+        python-version: 3.11
     - name: Pip install Sphinx & pre-commit
       run: |
         pip install --force-reinstall Sphinx sphinx-rtd-theme pre-commit

circup-2.0.1/.github/workflows/release.yml

@@ -0,0 +1,34 @@
+# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries
+# SPDX-FileCopyrightText: 2021 James Carr
+#
+# SPDX-License-Identifier: MIT
+
+name: Release Actions
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  upload-pypi:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+        depth: 0
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install build setuptools wheel twine
+    - name: Build and publish
+      env:
+        TWINE_USERNAME: ${{ secrets.pypi_username }}
+        TWINE_PASSWORD: ${{ secrets.pypi_password }}
+      run: |
+        python -m build
+        twine upload dist/*

{circup-1.8.0 → circup-2.0.1}/CONTRIBUTING.rst

@@ -25,15 +25,24 @@ Developer Setup
 
 .. note::
 
-    Please try to use Python 3.6+ while developing CircUp. This is so we can
+    Please try to use Python 3.9+ while developing CircUp. This is so we can
     use the
     `Black code formatter <https://black.readthedocs.io/en/stable/index.html>`_
-    (which only works with Python 3.6+).
+    and so that we're supporting versions which still receive security updates.
+
 
 Clone the repository and from the root of the project,
-install the requirements::
 
-    pip install -e ".[dev]"
+
+If you'd like you can setup a virtual environment and activate it.::
+
+    python3 -m venv .env
+    source .env/bin/activate
+
+install the development requirements::
+
+    pip install -r optional_requirements.txt
+
 
 Run the test suite::
 

{circup-1.8.0/circup.egg-info → circup-2.0.1}/PKG-INFO

@@ -1,11 +1,31 @@
 Metadata-Version: 2.1
 Name: circup
-Version: 1.8.0
+Version: 2.0.1
 Summary: A tool to manage/update libraries on CircuitPython devices.
-Home-page: https://github.com/adafruit/circup
-Author: Adafruit Industries
-Author-email: circuitpython@adafruit.com
-License: MIT
+Author-email: Adafruit Industries <circuitpython@adafruit.com>
+License: MIT License
+        
+        Copyright (c) 2019 Adafruit Industries
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+        
+Project-URL: homepage, https://github.com/adafruit/circup
 Keywords: adafruit,blinka,circuitpython,micropython,libraries
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
@@ -15,58 +35,16 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Education
 Classifier: Topic :: Software Development :: Embedded Systems
 Classifier: Topic :: System :: Software Distribution
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: semver~=3.0
-Requires-Dist: Click>=8.0
-Requires-Dist: appdirs>=1.4.3
-Requires-Dist: requests>=2.22.0
-Requires-Dist: findimports>=2.1.0
-Requires-Dist: toml>=0.10.2
-Requires-Dist: importlib_metadata; python_version == "3.7"
-Requires-Dist: update_checker
-Provides-Extra: tests
-Requires-Dist: pytest; extra == "tests"
-Requires-Dist: pylint; extra == "tests"
-Requires-Dist: pytest-cov; extra == "tests"
-Requires-Dist: pytest-random-order>=1.0.0; extra == "tests"
-Requires-Dist: pytest-faulthandler; extra == "tests"
-Requires-Dist: coverage; extra == "tests"
-Requires-Dist: black; extra == "tests"
-Provides-Extra: docs
-Requires-Dist: sphinx; extra == "docs"
-Provides-Extra: package
-Requires-Dist: wheel; extra == "package"
-Requires-Dist: twine; extra == "package"
-Provides-Extra: dev
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pylint; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest-random-order>=1.0.0; extra == "dev"
-Requires-Dist: pytest-faulthandler; extra == "dev"
-Requires-Dist: coverage; extra == "dev"
-Requires-Dist: black; extra == "dev"
-Requires-Dist: sphinx; extra == "dev"
-Requires-Dist: wheel; extra == "dev"
-Requires-Dist: twine; extra == "dev"
-Provides-Extra: all
-Requires-Dist: wheel; extra == "all"
-Requires-Dist: pytest-faulthandler; extra == "all"
-Requires-Dist: coverage; extra == "all"
-Requires-Dist: pylint; extra == "all"
-Requires-Dist: pytest; extra == "all"
-Requires-Dist: twine; extra == "all"
-Requires-Dist: sphinx; extra == "all"
-Requires-Dist: black; extra == "all"
-Requires-Dist: pytest-random-order>=1.0.0; extra == "all"
-Requires-Dist: pytest-cov; extra == "all"
 
 
 CircUp

{circup-1.8.0 → circup-2.0.1}/circup/backends.py

@@ -29,9 +29,10 @@ class Backend:
     implementations
     """
 
-    def __init__(self, logger):
+    def __init__(self, logger, version_override=None):
         self.device_location = None
         self.LIB_DIR_PATH = None
+        self.version_override = version_override
         self.logger = logger
 
     def get_circuitpython_version(self):
@@ -90,7 +91,13 @@ class Backend:
         """
         raise NotImplementedError
 
-    # pylint: disable=too-many-locals,too-many-branches,too-many-arguments,too-many-nested-blocks
+    def copy_file(self, target_file, location_to_paste):
+        """Paste a copy of the specified file at the location given
+        To be overridden by subclass
+        """
+        raise NotImplementedError
+
+    # pylint: disable=too-many-locals,too-many-branches,too-many-arguments,too-many-nested-blocks,too-many-statements
     def install_module(
         self, device_path, device_modules, name, pyext, mod_names, upgrade=False
     ):  # pragma: no cover
@@ -109,9 +116,19 @@ class Backend:
                            with get_bundle_versions()
         :param bool upgrade: Upgrade the specified modules if they're already installed.
         """
+        local_path = None
+        if os.path.exists(name):
+            # local file exists use that.
+            local_path = name
+            name = local_path.split(os.path.sep)[-1]
+            name = name.replace(".py", "").replace(".mpy", "")
+            click.echo(f"Installing from local path: {local_path}")
+
         if not name:
             click.echo("No module name(s) provided.")
-        elif name in mod_names:
+            return
+        if name in mod_names or local_path is not None:
+
             # Grab device modules to check if module already installed
             if name in device_modules:
                 if not upgrade:
@@ -129,14 +146,19 @@ class Backend:
                     module_path = _metadata["path"]
                     self.uninstall(device_path, module_path)
 
+            new_module_size = 0
             library_path = (
                 os.path.join(device_path, self.LIB_DIR_PATH)
                 if not isinstance(self, WebBackend)
                 else urljoin(device_path, self.LIB_DIR_PATH)
             )
-            metadata = mod_names[name]
-            bundle = metadata["bundle"]
-            bundle.size = os.path.getsize(metadata["path"])
+            if local_path is None:
+                metadata = mod_names[name]
+                bundle = metadata["bundle"]
+            else:
+                metadata = {"path": local_path}
+
+            new_module_size = os.path.getsize(metadata["path"])
             if os.path.isdir(metadata["path"]):
                 # pylint: disable=unused-variable
                 for dirpath, dirnames, filenames in os.walk(metadata["path"]):
@@ -144,7 +166,7 @@ class Backend:
                         fp = os.path.join(dirpath, f)
                         try:
                             if not os.path.islink(fp):  # Ignore symbolic links
-                                bundle.size += os.path.getsize(fp)
+                                new_module_size += os.path.getsize(fp)
                             else:
                                 self.logger.warning(
                                     f"Skipping symbolic link in space calculation: {fp}"
@@ -154,27 +176,29 @@ class Backend:
                                 f"Error: {e} - Skipping file in space calculation: {fp}"
                             )
 
-            if self.get_free_space() < bundle.size:
+            if self.get_free_space() < new_module_size:
                 self.logger.error(
                     f"Aborted installing module {name} - "
-                    f"not enough free space ({bundle.size} < {self.get_free_space()})"
+                    f"not enough free space ({new_module_size} < {self.get_free_space()})"
                 )
                 click.secho(
                     f"Aborted installing module {name} - "
-                    f"not enough free space ({bundle.size} < {self.get_free_space()})",
+                    f"not enough free space ({new_module_size} < {self.get_free_space()})",
                     fg="red",
                 )
                 return
 
             # Create the library directory first.
             self._create_library_directory(device_path, library_path)
-
-            if pyext:
-                # Use Python source for module.
-                self.install_module_py(metadata)
+            if local_path is None:
+                if pyext:
+                    # Use Python source for module.
+                    self.install_module_py(metadata)
+                else:
+                    # Use pre-compiled mpy modules.
+                    self.install_module_mpy(bundle, metadata)
             else:
-                # Use pre-compiled mpy modules.
-                self.install_module_mpy(bundle, metadata)
+                self.copy_file(metadata["path"], "lib")
             click.echo("Installed '{}'.".format(name))
         else:
             click.echo("Unknown module named, '{}'.".format(name))
@@ -252,7 +276,9 @@ class WebBackend(Backend):
     Backend for interacting with a device via Web Workflow
     """
 
-    def __init__(self, host, password, logger, timeout=10):
+    def __init__(  # pylint: disable=too-many-arguments
+        self, host, password, logger, timeout=10, version_override=None
+    ):
         super().__init__(logger)
         if password is None:
             raise ValueError("--host needs --password")
@@ -278,6 +304,7 @@ class WebBackend(Backend):
         self.session.mount(self.device_location, HTTPAdapter(max_retries=5))
         self.library_path = self.device_location + "/" + self.LIB_DIR_PATH
         self.timeout = timeout
+        self.version_override = version_override
 
     def install_file_http(self, source, location=None):
         """
@@ -378,6 +405,9 @@ class WebBackend(Backend):
 
         :return: A tuple with the version string for CircuitPython and the board ID string.
         """
+        if self.version_override is not None:
+            return self.version_override
+
         # pylint: disable=arguments-renamed
         with self.session.get(
             self.device_location + "/cp/version.json", timeout=self.timeout
@@ -520,6 +550,17 @@ class WebBackend(Backend):
                 _writeable_error()
             r.raise_for_status()
 
+    def copy_file(self, target_file, location_to_paste):
+        if os.path.isdir(target_file):
+            create_directory_url = urljoin(
+                self.device_location,
+                "/".join(("fs", location_to_paste, target_file, "")),
+            )
+            self._create_library_directory(self.device_location, create_directory_url)
+            self.install_dir_http(target_file)
+        else:
+            self.install_file_http(target_file)
+
     def install_module_mpy(self, bundle, metadata):
         """
         :param bundle library bundle.
@@ -707,9 +748,10 @@ class DiskBackend(Backend):
     :param logger: logger to use for outputting messages
     :param String boot_out: Optional mock contents of a boot_out.txt file
         to use for version information.
+    :param String version_override: Optional mock version to use.
     """
 
-    def __init__(self, device_location, logger, boot_out=None):
+    def __init__(self, device_location, logger, boot_out=None, version_override=None):
         if device_location is None:
             raise ValueError(
                 "Auto locating USB Disk based device failed. "
@@ -723,6 +765,7 @@ class DiskBackend(Backend):
         self.version_info = None
         if boot_out is not None:
             self.version_info = self.parse_boot_out_file(boot_out)
+        self.version_override = version_override
 
     def get_circuitpython_version(self):
         """
@@ -739,6 +782,9 @@ class DiskBackend(Backend):
 
         :return: A tuple with the version string for CircuitPython and the board ID string.
         """
+        if self.version_override is not None:
+            return self.version_override
+
         if not self.version_info:
             try:
                 with open(
@@ -775,6 +821,19 @@ class DiskBackend(Backend):
         if not os.path.exists(library_path):  # pragma: no cover
             os.makedirs(library_path)
 
+    def copy_file(self, target_file, location_to_paste):
+        target_filename = target_file.split(os.path.sep)[-1]
+        if os.path.isdir(target_file):
+            shutil.copytree(
+                target_file,
+                os.path.join(self.device_location, location_to_paste, target_filename),
+            )
+        else:
+            shutil.copyfile(
+                target_file,
+                os.path.join(self.device_location, location_to_paste, target_filename),
+            )
+
     def install_module_mpy(self, bundle, metadata):
         """
         :param bundle library bundle.

{circup-1.8.0 → circup-2.0.1}/circup/command_utils.py

@@ -6,6 +6,7 @@ Functions called from commands in order to provide behaviors and return informat
 """
 
 import ctypes
+import glob
 import os
 
 from subprocess import check_output
@@ -90,6 +91,7 @@ def completion_for_install(ctx, param, incomplete):
     module_names = {m.replace(".py", "") for m in available_modules}
     if incomplete:
         module_names = [name for name in module_names if name.startswith(incomplete)]
+        module_names.extend(glob.glob(f"{incomplete}*"))
     return sorted(module_names)
 
 
@@ -446,6 +448,7 @@ def get_dependencies(*requested_libraries, mod_names, to_install=()):
     :param list(str) to_install: Modules already selected for installation.
     :return: tuple of module names to install which we build
     """
+    # pylint: disable=too-many-branches
     # Internal variables
     _to_install = to_install
     _requested_libraries = []
@@ -471,10 +474,14 @@ def get_dependencies(*requested_libraries, mod_names, to_install=()):
                 _requested_libraries.append(canonical_lib_name)
             except KeyError:
                 if canonical_lib_name not in WARNING_IGNORE_MODULES:
-                    click.secho(
-                        f"WARNING:\n\t{canonical_lib_name} is not a known CircuitPython library.",
-                        fg="yellow",
-                    )
+                    if os.path.exists(canonical_lib_name):
+                        _requested_libraries.append(canonical_lib_name)
+                    else:
+                        click.secho(
+                            f"WARNING:\n\t{canonical_lib_name} "
+                            f"is not a known CircuitPython library.",
+                            fg="yellow",
+                        )
 
     if not _requested_libraries:
         # If nothing is requested, we're done
@@ -484,16 +491,20 @@ def get_dependencies(*requested_libraries, mod_names, to_install=()):
         if library not in _to_install:
             _to_install = _to_install + (library,)
             # get the requirements.txt from bundle
-            bundle = mod_names[library]["bundle"]
-            requirements_txt = bundle.requirements_for(library)
-            if requirements_txt:
-                _requested_libraries.extend(
-                    libraries_from_requirements(requirements_txt)
-                )
+            try:
+                bundle = mod_names[library]["bundle"]
+                requirements_txt = bundle.requirements_for(library)
+                if requirements_txt:
+                    _requested_libraries.extend(
+                        libraries_from_requirements(requirements_txt)
+                    )
 
-            circup_dependencies = get_circup_dependencies(bundle, library)
-            for circup_dependency in circup_dependencies:
-                _requested_libraries.append(circup_dependency)
+                circup_dependencies = get_circup_dependencies(bundle, library)
+                for circup_dependency in circup_dependencies:
+                    _requested_libraries.append(circup_dependency)
+            except KeyError:
+                # don't check local file for further dependencies
+                pass
 
         # we've processed this library, remove it from the list
         _requested_libraries.remove(library)

{circup-1.8.0 → circup-2.0.1}/circup/commands.py

@@ -57,7 +57,10 @@ from circup.command_utils import (
     help="Hostname or IP address of a device. Overrides automatic path detection.",
 )
 @click.option(
-    "--password", help="Password to use for authentication when --host is used."
+    "--password",
+    help="Password to use for authentication when --host is used."
+    " You can optionally set an environment variable CIRCUP_WEBWORKFLOW_PASSWORD"
+    " instead of passing this argument. If both exist the CLI arg takes precedent.",
 )
 @click.option(
     "--timeout",
@@ -90,6 +93,10 @@ def main(  # pylint: disable=too-many-locals
     # pylint: disable=too-many-arguments,too-many-branches,too-many-statements,too-many-locals
     ctx.ensure_object(dict)
     ctx.obj["TIMEOUT"] = timeout
+
+    if password is None:
+        password = os.getenv("CIRCUP_WEBWORKFLOW_PASSWORD")
+
     device_path = get_device_path(host, password, path)
 
     using_webworkflow = "host" in ctx.params.keys() and ctx.params["host"] is not None
@@ -105,7 +112,11 @@ def main(  # pylint: disable=too-many-locals
             device_path = device_path.replace("circuitpython.local", host)
         try:
             ctx.obj["backend"] = WebBackend(
-                host=host, password=password, logger=logger, timeout=timeout
+                host=host,
+                password=password,
+                logger=logger,
+                timeout=timeout,
+                version_override=cpy_version,
             )
         except ValueError as e:
             click.secho(e, fg="red")
@@ -116,7 +127,11 @@ def main(  # pylint: disable=too-many-locals
             sys.exit(1)
     else:
         try:
-            ctx.obj["backend"] = DiskBackend(device_path, logger)
+            ctx.obj["backend"] = DiskBackend(
+                device_path,
+                logger,
+                version_override=cpy_version,
+            )
         except ValueError as e:
             print(e)
 
@@ -302,7 +317,7 @@ def install(
     """
     Install a named module(s) onto the device. Multiple modules
     can be installed at once by providing more than one module name, each
-    separated by a space.
+    separated by a space. Modules can be from a Bundle or local filepaths.
     """
 
     # TODO: Ensure there's enough space on the device

{circup-1.8.0 → circup-2.0.1/circup.egg-info}/PKG-INFO

@@ -1,11 +1,31 @@
 Metadata-Version: 2.1
 Name: circup
-Version: 1.8.0
+Version: 2.0.1
 Summary: A tool to manage/update libraries on CircuitPython devices.
-Home-page: https://github.com/adafruit/circup
-Author: Adafruit Industries
-Author-email: circuitpython@adafruit.com
-License: MIT
+Author-email: Adafruit Industries <circuitpython@adafruit.com>
+License: MIT License
+        
+        Copyright (c) 2019 Adafruit Industries
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+        
+Project-URL: homepage, https://github.com/adafruit/circup
 Keywords: adafruit,blinka,circuitpython,micropython,libraries
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
@@ -15,58 +35,16 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Education
 Classifier: Topic :: Software Development :: Embedded Systems
 Classifier: Topic :: System :: Software Distribution
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: semver~=3.0
-Requires-Dist: Click>=8.0
-Requires-Dist: appdirs>=1.4.3
-Requires-Dist: requests>=2.22.0
-Requires-Dist: findimports>=2.1.0
-Requires-Dist: toml>=0.10.2
-Requires-Dist: importlib_metadata; python_version == "3.7"
-Requires-Dist: update_checker
-Provides-Extra: tests
-Requires-Dist: pytest; extra == "tests"
-Requires-Dist: pylint; extra == "tests"
-Requires-Dist: pytest-cov; extra == "tests"
-Requires-Dist: pytest-random-order>=1.0.0; extra == "tests"
-Requires-Dist: pytest-faulthandler; extra == "tests"
-Requires-Dist: coverage; extra == "tests"
-Requires-Dist: black; extra == "tests"
-Provides-Extra: docs
-Requires-Dist: sphinx; extra == "docs"
-Provides-Extra: package
-Requires-Dist: wheel; extra == "package"
-Requires-Dist: twine; extra == "package"
-Provides-Extra: dev
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pylint; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest-random-order>=1.0.0; extra == "dev"
-Requires-Dist: pytest-faulthandler; extra == "dev"
-Requires-Dist: coverage; extra == "dev"
-Requires-Dist: black; extra == "dev"
-Requires-Dist: sphinx; extra == "dev"
-Requires-Dist: wheel; extra == "dev"
-Requires-Dist: twine; extra == "dev"
-Provides-Extra: all
-Requires-Dist: wheel; extra == "all"
-Requires-Dist: pytest-faulthandler; extra == "all"
-Requires-Dist: coverage; extra == "all"
-Requires-Dist: pylint; extra == "all"
-Requires-Dist: pytest; extra == "all"
-Requires-Dist: twine; extra == "all"
-Requires-Dist: sphinx; extra == "all"
-Requires-Dist: black; extra == "all"
-Requires-Dist: pytest-random-order>=1.0.0; extra == "all"
-Requires-Dist: pytest-cov; extra == "all"
 
 
 CircUp

{circup-1.8.0 → circup-2.0.1}/circup.egg-info/SOURCES.txt

@@ -11,10 +11,10 @@ README.rst
 README.rst.license
 optional_requirements.txt
 optional_requirements.txt.license
+pyproject.toml
 readthedocs.yml
 requirements.txt
 requirements.txt.license
-setup.py
 .github/ISSUE_TEMPLATE.md
 .github/PULL_REQUEST_TEMPLATE.md
 .github/workflows/build.yml
@@ -34,7 +34,6 @@ circup.egg-info/PKG-INFO
 circup.egg-info/SOURCES.txt
 circup.egg-info/dependency_links.txt
 circup.egg-info/entry_points.txt
-circup.egg-info/requires.txt
 circup.egg-info/top_level.txt
 circup/config/bundle_config.json
 circup/config/bundle_config.json.license

circup-2.0.1/pyproject.toml

@@ -0,0 +1,51 @@
+# SPDX-FileCopyrightText: 2024 Jev Kuznetsov, ROX Automation
+#
+# SPDX-License-Identifier: MIT
+
+[build-system]
+requires = ["setuptools>=61.0", "setuptools-scm"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "circup"
+dynamic = ["version"]
+description = "A tool to manage/update libraries on CircuitPython devices."
+readme = "README.rst"
+authors = [{ name = "Adafruit Industries", email = "circuitpython@adafruit.com" }]
+license = { file = "LICENSE" }
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Environment :: Console",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Education",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: POSIX",
+    "Operating System :: MacOS :: MacOS X",
+    "Operating System :: Microsoft :: Windows",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Topic :: Education",
+    "Topic :: Software Development :: Embedded Systems",
+    "Topic :: System :: Software Distribution"
+]
+keywords = ["adafruit", "blinka", "circuitpython", "micropython", "libraries"]
+
+requires-python = ">=3.9"
+
+[tool.setuptools.dynamic]
+dependencies = {file = ["requirements.txt"]}
+optional-dependencies = {optional = {file = ["optional_requirements.txt"]}}
+
+[tool.setuptools_scm]
+
+[project.scripts]
+circup = "circup:main"
+
+[project.urls]
+homepage = "https://github.com/adafruit/circup"
+
+[tool.setuptools.packages.find]
+where = ["."]  # This tells setuptools to look in the project root directory
+include = ["circup"]  # This pattern includes your main package and any sub-packages within it

{circup-1.8.0 → circup-2.0.1}/tests/import_styles.py

@@ -4,5 +4,5 @@
 # pylint: disable=all
 import adafruit_bus_device
 from adafruit_button import Button
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
+from adafruit_esp32spi import adafruit_esp32spi_socketpool
 import adafruit_hid.consumer_control

circup-1.8.0/.github/workflows/release.yml

@@ -1,39 +0,0 @@
-# SPDX-FileCopyrightText: 2019 Nicholas Tollervey, written for Adafruit Industries
-
-# SPDX-License-Identifier: MIT
-
-name: Release Actions
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  upload-pypi:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        show-progress: false
-    - name: Check For setup.py
-      id: need-pypi
-      run: |
-        echo ::set-output name=setup-py::$( find . -wholename './setup.py' )
-    - name: Set up Python
-      if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
-      uses: actions/setup-python@v1
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
-      run: |
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
-    - name: Build and publish
-      if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
-      env:
-        TWINE_USERNAME: ${{ secrets.pypi_username }}
-        TWINE_PASSWORD: ${{ secrets.pypi_password }}
-      run: |
-        python setup.py sdist
-        twine upload dist/*

circup-1.8.0/circup.egg-info/requires.txt

@@ -1,50 +0,0 @@
-semver~=3.0
-Click>=8.0
-appdirs>=1.4.3
-requests>=2.22.0
-findimports>=2.1.0
-toml>=0.10.2
-update_checker
-
-[:python_version == "3.7"]
-importlib_metadata
-
-[all]
-wheel
-pytest-faulthandler
-coverage
-pylint
-pytest
-twine
-sphinx
-black
-pytest-random-order>=1.0.0
-pytest-cov
-
-[dev]
-pytest
-pylint
-pytest-cov
-pytest-random-order>=1.0.0
-pytest-faulthandler
-coverage
-black
-sphinx
-wheel
-twine
-
-[docs]
-sphinx
-
-[package]
-wheel
-twine
-
-[tests]
-pytest
-pylint
-pytest-cov
-pytest-random-order>=1.0.0
-pytest-faulthandler
-coverage
-black

circup-1.8.0/setup.py

@@ -1,104 +0,0 @@
-# SPDX-FileCopyrightText: 2019 Nicholas Tollervey, written for Adafruit Industries
-#
-# SPDX-License-Identifier: MIT
-
-
-"""A setuptools based setup module.
-See:
-https://packaging.python.org/guides/distributing-packages-using-setuptools/
-https://github.com/pypa/sampleproject
-"""
-
-# Always prefer setuptools over distutils
-from setuptools import setup, find_packages
-
-# To use a consistent encoding
-from codecs import open
-from os import path
-
-here = path.abspath(path.dirname(__file__))
-
-# Get the long description from the README file
-with open(path.join(here, "README.rst"), encoding="utf-8") as f:
-    long_description = f.read()
-
-install_requires = [
-    "semver~=3.0",
-    "Click>=8.0",
-    "appdirs>=1.4.3",
-    "requests>=2.22.0",
-    "findimports>=2.1.0",
-    "toml>=0.10.2",
-    # importlib_metadata is only available for 3.7, and is not needed for 3.8 and up.
-    "importlib_metadata; python_version == '3.7'",
-    "update_checker",
-]
-
-extras_require = {
-    "tests": [
-        "pytest",
-        "pylint",
-        "pytest-cov",
-        "pytest-random-order>=1.0.0",
-        "pytest-faulthandler",
-        "coverage",
-        "black",
-    ],
-    "docs": ["sphinx"],
-    "package": [
-        # Wheel building and PyPI uploading
-        "wheel",
-        "twine",
-    ],
-}
-
-extras_require["dev"] = (
-    extras_require["tests"] + extras_require["docs"] + extras_require["package"]
-)
-
-extras_require["all"] = list(
-    {req for extra, reqs in extras_require.items() for req in reqs}
-)
-
-setup(
-    name="circup",
-    use_scm_version=True,
-    setup_requires=["setuptools_scm"],
-    description="A tool to manage/update libraries on CircuitPython devices.",
-    long_description=long_description,
-    long_description_content_type="text/x-rst",
-    # The project's main homepage.
-    url="https://github.com/adafruit/circup",
-    # Author details
-    author="Adafruit Industries",
-    author_email="circuitpython@adafruit.com",
-    install_requires=install_requires,
-    extras_require=extras_require,
-    # Choose your license
-    license="MIT",
-    # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
-    classifiers=[
-        "Development Status :: 3 - Alpha",
-        "Environment :: Console",
-        "Intended Audience :: Developers",
-        "Intended Audience :: Education",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: POSIX",
-        "Operating System :: MacOS :: MacOS X",
-        "Operating System :: Microsoft :: Windows",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Topic :: Education",
-        "Topic :: Software Development :: Embedded Systems",
-        "Topic :: System :: Software Distribution",
-    ],
-    entry_points={"console_scripts": ["circup=circup:main"]},
-    # What does your project relate to?
-    keywords="adafruit, blinka, circuitpython, micropython, libraries",
-    # You can just specify the packages manually here if your project is
-    # simple. Or you can use find_packages().
-    packages=["circup"],
-    package_data={"circup": ["config/bundle_config.json"]},
-)