circup 2.2.2__py3-none-any.whl → 2.2.4__py3-none-any.whl

circup/command_utils.py

@@ -673,14 +673,15 @@ def imports_from_code(full_content):
     return sorted(imports)
 
 
-def get_all_imports(
-    backend, auto_file_content, mod_names, current_module, visited=None
+def get_all_imports(  # pylint: disable=too-many-arguments,too-many-locals, too-many-branches
+    backend, auto_file_content, auto_file_path, mod_names, current_module, visited=None
 ):
     """
     Recursively retrieve imports from files on the backend
 
     :param Backend backend: The current backend object
     :param str auto_file_content: Content of the python file to analyse
+    :param str auto_file_path: Path to the python file to analyse
     :param list mod_names: Lits of supported bundle mod names
     :param str current_module: Name of the call context module if recursive call
     :param set visited: Modules previously visited
@@ -714,18 +715,37 @@ def get_all_imports(
                 install_module = install
             # possible files for the module: .py or __init__.py (if directory)
             file_name = os.path.join(*install_module.split(".")) + ".py"
-            exists = backend.file_exists(file_name)
+            try:
+                file_location = os.path.join(
+                    *auto_file_path.replace(str(backend.device_location), "").split(
+                        "/"
+                    )[:-1]
+                )
+
+                full_location = os.path.join(file_location, file_name)
+
+            except TypeError:
+                # file is in root of CIRCUITPY
+                full_location = file_name
+
+            exists = backend.file_exists(full_location)
             if not exists:
                 file_name = os.path.join(*install_module.split("."), "__init__.py")
-                exists = backend.file_exists(file_name)
+                full_location = file_name
+                exists = backend.file_exists(full_location)
                 if not exists:
                     continue
                 install_module += ".__init__"
             # get the content and parse it recursively
-            auto_file_content = backend.get_file_content(file_name)
+            auto_file_content = backend.get_file_content(full_location)
             if auto_file_content:
                 sub_imports = get_all_imports(
-                    backend, auto_file_content, mod_names, install_module, visited
+                    backend,
+                    auto_file_content,
+                    auto_file_path,
+                    mod_names,
+                    install_module,
+                    visited,
                 )
                 requested_installs.extend(sub_imports)
 
@@ -775,7 +795,9 @@ def libraries_from_auto_file(backend, auto_file, mod_names):
     # from file name to module name (in case it's in a subpackage)
     click.secho(f"Finding imports from: {auto_file}", fg="green")
     current_module = auto_file.rstrip(".py").replace(os.path.sep, ".")
-    return get_all_imports(backend, auto_file_content, mod_names, current_module)
+    return get_all_imports(
+        backend, auto_file_content, auto_file, mod_names, current_module
+    )
 
 
 def get_device_path(host, port, password, path):
@@ -819,3 +841,15 @@ def sorted_by_directory_then_alpha(list_of_files):
         sorted_full_list.append(files[cur_name])
 
     return sorted_full_list
+
+
+def is_virtual_env_active():
+    """
+    Check if a virtual environment is currently active.
+
+    We don't check the more commonly recommended way of checking if
+    sys.prefix != sys.base_prefix as this will always be true if running circup
+    from a pipx install. This way ensures the user manually activated a
+    virtual environment, regardless how circup is installed.
+    """
+    return "VIRTUAL_ENV" in os.environ

circup/commands.py

@@ -41,6 +41,7 @@ from circup.command_utils import (
     get_bundles_dict,
     completion_for_example,
     get_bundle_examples,
+    is_virtual_env_active,
 )
 
 
@@ -354,6 +355,7 @@ def install(
     device_modules = ctx.obj["backend"].get_device_versions()
     if to_install is not None:
         to_install = sorted(to_install)
+        is_global_install_ok = None
         click.echo(f"Ready to install: {to_install}\n")
         for library in to_install:
             ctx.obj["backend"].install_module(
@@ -366,6 +368,26 @@ def install(
             )
 
             if stubs:
+                # Check we are in a virtual environment
+                if not is_virtual_env_active():
+                    if is_global_install_ok is None:
+                        click.secho(
+                            (
+                                "No virtual environment detected.\n"
+                                "It is recommended to run circup inside a virtual environment "
+                                "when installing stubs. Without a virtual environment, the stubs "
+                                "will be installed to the global python."
+                            ),
+                            fg="yellow",
+                        )
+                        is_global_install_ok = click.confirm(
+                            click.style(
+                                "Would you still like to install stubs (to the global python)?",
+                                fg="yellow",
+                            )
+                        )
+                    if not is_global_install_ok:
+                        continue
                 library_stubs = "adafruit-circuitpython-{}".format(
                     library.replace("adafruit_", "")
                 )

{circup-2.2.2.dist-info → circup-2.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: circup
-Version: 2.2.2
+Version: 2.2.4
 Summary: A tool to manage/update libraries on CircuitPython devices.
 Author-email: Adafruit Industries <circuitpython@adafruit.com>
 License: MIT License

{circup-2.2.2.dist-info → circup-2.2.4.dist-info}/RECORD

@@ -1,8 +1,8 @@
 circup/__init__.py,sha256=9A98U3DyA14tm-7_d88fGSlLfEKz9T_85t8kXkErqRg,662
 circup/backends.py,sha256=g9Q9xCGZidwsEDL2Ga2cm50YYB54IiqlKUPcxj-pWZA,40008
 circup/bundle.py,sha256=FEP4F470aJtwmm8jgTM3DgR3dj5SVwbX1tbyIRKVHn8,5327
-circup/command_utils.py,sha256=8CaCy34EQcrDwcnXbyRvTZ-aUU-yCJ0Om8V1QuRNSbA,29392
-circup/commands.py,sha256=1UQ8EONlcEFQsytPO3LAHLcNHZIO0Fi5XCU47quzt08,27436
+circup/command_utils.py,sha256=FNEhTYbbCT9UzKv4NG5lhbWHlObSEl4DQ7iDd8O0-cs,30581
+circup/commands.py,sha256=jrgJDmqx4U1K--_OnZoOt1d9n1QRNnInK_nBeWrThMw,28542
 circup/logging.py,sha256=hu4v8ljkXo8ru-cqs0W3PU-xEVvTO_qqMKDJM18OXbQ,1115
 circup/module.py,sha256=33_kdy5BZn6COyIjAFZMpw00rTtPiryQZWFXQkMF8FY,7435
 circup/shared.py,sha256=IBW3v0rry1wLr8yR8_xHfe0QC5SFGzv6bdnPv96vZaM,8944
@@ -12,9 +12,9 @@ circup/wwshell/README.rst,sha256=M_jFP0hwOcngF0RdosdeqmVOISNcPzyjTW3duzIu9A8,361
 circup/wwshell/README.rst.license,sha256=GhA0SoZGP7CReDam-JJk_UtIQIpQaZWQFzR26YSuMm4,107
 circup/wwshell/__init__.py,sha256=CAPZiYrouWboyPx4KiWLBG_vf_n0MmArGqaFyTXGKWk,398
 circup/wwshell/commands.py,sha256=-I5l7XeoDmvWWuZg5wHdt9qe__SBQ1EGmKwCDTBMeus,7454
-circup-2.2.2.dist-info/licenses/LICENSE,sha256=bVlIMmSL_pqLCqae4hzixy9pYXD808IbgsMoQXTNLBk,1076
-circup-2.2.2.dist-info/METADATA,sha256=wMlI-fgxQc4nFLyTGpQIeks6iBjLQvF0tqafWbTfsZM,13617
-circup-2.2.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-circup-2.2.2.dist-info/entry_points.txt,sha256=FjTmwYD_ApgLRGifUrr_Ui1voW6fEzodQc3DKNzoAPc,69
-circup-2.2.2.dist-info/top_level.txt,sha256=Qx6E0eZgSBE10ciNKsLZx8-TTy_9fEVZh7NLmn24KcU,7
-circup-2.2.2.dist-info/RECORD,,
+circup-2.2.4.dist-info/licenses/LICENSE,sha256=bVlIMmSL_pqLCqae4hzixy9pYXD808IbgsMoQXTNLBk,1076
+circup-2.2.4.dist-info/METADATA,sha256=DmXRgPwq1G5-zZoilQRa6vtK1eP3clouiQy4LOt0teA,13617
+circup-2.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+circup-2.2.4.dist-info/entry_points.txt,sha256=FjTmwYD_ApgLRGifUrr_Ui1voW6fEzodQc3DKNzoAPc,69
+circup-2.2.4.dist-info/top_level.txt,sha256=Qx6E0eZgSBE10ciNKsLZx8-TTy_9fEVZh7NLmn24KcU,7
+circup-2.2.4.dist-info/RECORD,,

{circup-2.2.2.dist-info → circup-2.2.4.dist-info}/WHEEL

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