mposcli 0.6.0__tar.gz → 0.7.0__tar.gz

{mposcli-0.6.0 → mposcli-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mposcli
-Version: 0.6.0
+Version: 0.7.0
 Summary: CLI helper for MicroPythonOS: https://github.com/MicroPythonOS/MicroPythonOS
 Project-URL: Documentation, https://github.com/jedie/mposcli
 Project-URL: Source, https://github.com/jedie/mposcli
@@ -244,16 +244,22 @@ the REPL. The goal it to try to get a REPL in a loop until it works.
 
 [comment]: <> (✂✂✂ auto generated update start ✂✂✂)
 ```
-usage: mposcli update [-h] [-v]
+usage: mposcli update [-h] [--cleanup | --no-cleanup] [--shallow-clone | --no-shallow-
+clone] [-v]
 
 Update MicroPythonOS repository. Assume that there is a "origin" and/or "upstream" remote
 configured. Will also ask if you want to update the submodules as well, which is
 recommended.
 
-╭─ options ────────────────────────────────────────────────────────────────╮
-│ -h, --help       show this help message and exit                         │
-│ -v, --verbosity  Verbosity level; e.g.: -v, -vv, -vvv, etc. (repeatable) │
-╰──────────────────────────────────────────────────────────────────────────╯
+╭─ options ──────────────────────────────────────────────────────────────────────────────╮
+│ -h, --help       show this help message and exit                                       │
+│ --cleanup, --no-cleanup                                                                │
+│                  Cleanup unnecessary files and optimize the local repository, too?     │
+│                  (default: True)                                                       │
+│ --shallow-clone, --no-shallow-clone                                                    │
+│                  Submodules only a shallow clone with --depth=1? (default: False)      │
+│ -v, --verbosity  Verbosity level; e.g.: -v, -vv, -vvv, etc. (repeatable)               │
+╰────────────────────────────────────────────────────────────────────────────────────────╯
 ```
 [comment]: <> (✂✂✂ auto generated update end ✂✂✂)
 
@@ -265,16 +271,22 @@ recommended.
 
 [comment]: <> (✂✂✂ auto generated update-submodules start ✂✂✂)
 ```
-usage: mposcli update-submodules [-h] [-v]
+usage: mposcli update-submodules [-h] [--cleanup | --no-cleanup] [--shallow-clone | --no-
+shallow-clone] [-v]
 
 Updates MicroPythonOS git submodules only. Use "mposcli update" to update the main
 repository and optionally the submodules as well. see: https://docs.micropythonos.com/os-
 development/linux/#optional-updating-the-code
 
-╭─ options ────────────────────────────────────────────────────────────────╮
-│ -h, --help       show this help message and exit                         │
-│ -v, --verbosity  Verbosity level; e.g.: -v, -vv, -vvv, etc. (repeatable) │
-╰──────────────────────────────────────────────────────────────────────────╯
+╭─ options ──────────────────────────────────────────────────────────────────────────────╮
+│ -h, --help       show this help message and exit                                       │
+│ --cleanup, --no-cleanup                                                                │
+│                  Cleanup unnecessary files and optimize the local repository, too?     │
+│                  (default: True)                                                       │
+│ --shallow-clone, --no-shallow-clone                                                    │
+│                  Submodules only a shallow clone with --depth=1? (default: False)      │
+│ -v, --verbosity  Verbosity level; e.g.: -v, -vv, -vvv, etc. (repeatable)               │
+╰────────────────────────────────────────────────────────────────────────────────────────╯
 ```
 [comment]: <> (✂✂✂ auto generated update-submodules end ✂✂✂)
 
@@ -343,6 +355,9 @@ completion,test,update,update-readme-history,update-test-snapshot-files,version}
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v0.7.0](https://github.com/jedie/mposcli/compare/v0.6.0...v0.7.0)
+  * 2026-03-24 - Safe diskspace in mposcli update / update-submodules
+  * 2026-03-22 - Use "retry loop" for copy, too
 * [v0.6.0](https://github.com/jedie/mposcli/compare/v0.5.0...v0.6.0)
   * 2026-03-21 - NEW: "shell" to start the REPL
 * [v0.5.0](https://github.com/jedie/mposcli/compare/v0.4.1...v0.5.0)
@@ -352,15 +367,15 @@ completion,test,update,update-readme-history,update-test-snapshot-files,version}
   * 2026-03-03 - flash command: use port auto detection as default
 * [v0.4.1](https://github.com/jedie/mposcli/compare/v0.4.0...v0.4.1)
   * 2026-02-27 - Use "--force" for pulling submodules to overwrite local changes
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.4.0](https://github.com/jedie/mposcli/compare/v0.3.0...v0.4.0)
   * 2026-02-24 - NEW command: "cp-app" to install/update internal_filesystem/apps
   * 2026-02-24 - Log skipped files
   * 2026-02-23 - Update requirements and fix code style
   * 2026-02-23 - "build" command: target as positional argument
   * 2026-02-23 - Expand "cp" command and allow optional filesystem path
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v0.3.0](https://github.com/jedie/mposcli/compare/v0.2.0...v0.3.0)
   * 2026-02-18 - Add "update" beside "update-submodules"
   * 2026-02-17 - Update requirements

{mposcli-0.6.0 → mposcli-0.7.0}/README.md

@@ -229,16 +229,22 @@ the REPL. The goal it to try to get a REPL in a loop until it works.
 
 [comment]: <> (✂✂✂ auto generated update start ✂✂✂)
 ```
-usage: mposcli update [-h] [-v]
+usage: mposcli update [-h] [--cleanup | --no-cleanup] [--shallow-clone | --no-shallow-
+clone] [-v]
 
 Update MicroPythonOS repository. Assume that there is a "origin" and/or "upstream" remote
 configured. Will also ask if you want to update the submodules as well, which is
 recommended.
 
-╭─ options ────────────────────────────────────────────────────────────────╮
-│ -h, --help       show this help message and exit                         │
-│ -v, --verbosity  Verbosity level; e.g.: -v, -vv, -vvv, etc. (repeatable) │
-╰──────────────────────────────────────────────────────────────────────────╯
+╭─ options ──────────────────────────────────────────────────────────────────────────────╮
+│ -h, --help       show this help message and exit                                       │
+│ --cleanup, --no-cleanup                                                                │
+│                  Cleanup unnecessary files and optimize the local repository, too?     │
+│                  (default: True)                                                       │
+│ --shallow-clone, --no-shallow-clone                                                    │
+│                  Submodules only a shallow clone with --depth=1? (default: False)      │
+│ -v, --verbosity  Verbosity level; e.g.: -v, -vv, -vvv, etc. (repeatable)               │
+╰────────────────────────────────────────────────────────────────────────────────────────╯
 ```
 [comment]: <> (✂✂✂ auto generated update end ✂✂✂)
 
@@ -250,16 +256,22 @@ recommended.
 
 [comment]: <> (✂✂✂ auto generated update-submodules start ✂✂✂)
 ```
-usage: mposcli update-submodules [-h] [-v]
+usage: mposcli update-submodules [-h] [--cleanup | --no-cleanup] [--shallow-clone | --no-
+shallow-clone] [-v]
 
 Updates MicroPythonOS git submodules only. Use "mposcli update" to update the main
 repository and optionally the submodules as well. see: https://docs.micropythonos.com/os-
 development/linux/#optional-updating-the-code
 
-╭─ options ────────────────────────────────────────────────────────────────╮
-│ -h, --help       show this help message and exit                         │
-│ -v, --verbosity  Verbosity level; e.g.: -v, -vv, -vvv, etc. (repeatable) │
-╰──────────────────────────────────────────────────────────────────────────╯
+╭─ options ──────────────────────────────────────────────────────────────────────────────╮
+│ -h, --help       show this help message and exit                                       │
+│ --cleanup, --no-cleanup                                                                │
+│                  Cleanup unnecessary files and optimize the local repository, too?     │
+│                  (default: True)                                                       │
+│ --shallow-clone, --no-shallow-clone                                                    │
+│                  Submodules only a shallow clone with --depth=1? (default: False)      │
+│ -v, --verbosity  Verbosity level; e.g.: -v, -vv, -vvv, etc. (repeatable)               │
+╰────────────────────────────────────────────────────────────────────────────────────────╯
 ```
 [comment]: <> (✂✂✂ auto generated update-submodules end ✂✂✂)
 
@@ -328,6 +340,9 @@ completion,test,update,update-readme-history,update-test-snapshot-files,version}
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v0.7.0](https://github.com/jedie/mposcli/compare/v0.6.0...v0.7.0)
+  * 2026-03-24 - Safe diskspace in mposcli update / update-submodules
+  * 2026-03-22 - Use "retry loop" for copy, too
 * [v0.6.0](https://github.com/jedie/mposcli/compare/v0.5.0...v0.6.0)
   * 2026-03-21 - NEW: "shell" to start the REPL
 * [v0.5.0](https://github.com/jedie/mposcli/compare/v0.4.1...v0.5.0)
@@ -337,15 +352,15 @@ completion,test,update,update-readme-history,update-test-snapshot-files,version}
   * 2026-03-03 - flash command: use port auto detection as default
 * [v0.4.1](https://github.com/jedie/mposcli/compare/v0.4.0...v0.4.1)
   * 2026-02-27 - Use "--force" for pulling submodules to overwrite local changes
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.4.0](https://github.com/jedie/mposcli/compare/v0.3.0...v0.4.0)
   * 2026-02-24 - NEW command: "cp-app" to install/update internal_filesystem/apps
   * 2026-02-24 - Log skipped files
   * 2026-02-23 - Update requirements and fix code style
   * 2026-02-23 - "build" command: target as positional argument
   * 2026-02-23 - Expand "cp" command and allow optional filesystem path
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v0.3.0](https://github.com/jedie/mposcli/compare/v0.2.0...v0.3.0)
   * 2026-02-18 - Add "update" beside "update-submodules"
   * 2026-02-17 - Update requirements

{mposcli-0.6.0 → mposcli-0.7.0}/mposcli/__init__.py

@@ -4,5 +4,5 @@
 """
 
 # See https://packaging.python.org/en/latest/specifications/version-specifiers/
-__version__ = '0.6.0'
+__version__ = '0.7.0'
 __author__ = 'Jens Diemer <cookiecutter_templates@jensdiemer.de>'

{mposcli-0.6.0 → mposcli-0.7.0}/mposcli/cli_app/copy_mpos.py

@@ -14,7 +14,7 @@ from mposcli.cli_app import app
 from mposcli.mpos_utils import get_mpos_path
 from mposcli.tools import get_mpremote_bin
 from mposcli.user_input import choose_newest_modified_directory, get_newest_files
-from mposcli.utilities.mpremote import MpOsPathResolver, start_mpremote_repl
+from mposcli.utilities.mpremote import MpOsPathResolver, check_call_loop, start_mpremote_repl
 
 
 logger = logging.getLogger(__name__)
@@ -79,12 +79,11 @@ def cp(
     else:
         print(f'Copying file "[bold]{local_path_str}[/bold]" to device at "[bold]{remote_str}[/bold]" ...')
 
-    verbose_check_call(
-        *popenargs,
-        'cp',
-        local_path_str,
-        remote_str,
-        verbose=True,
+    popenargs += ('cp', local_path_str, remote_str)
+    check_call_loop(
+        popen_args=popenargs,
+        max_try=10,
+        wait_time=1,
         cwd=mpos_path,
         text=None,
     )
@@ -146,9 +145,11 @@ def cp_app(
         remote_path = f':/apps/{app.name}'
 
     popenargs += (local_path, remote_path)
-    verbose_check_call(
-        *popenargs,
-        verbose=True,
+
+    check_call_loop(
+        popen_args=popenargs,
+        max_try=10,
+        wait_time=1,
         cwd=mpos_path,
         text=None,
     )
@@ -164,12 +165,4 @@ def cp_app(
         )
 
     if repl:
-        time.sleep(1)
-        verbose_check_call(
-            mpremote_bin,
-            'repl',
-            verbose=True,
-            cwd=mpos_path,
-            timeout=None,
-            text=None,
-        )
+        start_mpremote_repl()

mposcli-0.7.0/mposcli/cli_app/update.py

@@ -0,0 +1,102 @@
+import logging
+import shutil
+from typing import Annotated
+
+import tyro
+from cli_base.cli_tools.git import Git
+from cli_base.cli_tools.verbosity import setup_logging
+from cli_base.tyro_commands import TyroVerbosityArgType
+from rich import print
+
+from mposcli.cli_app import app
+from mposcli.mpos_utils import get_mpos_path
+
+
+logger = logging.getLogger(__name__)
+
+
+def _update_submodules(git: Git, *, cleanup, shallow_clone):
+    if shallow_clone:
+        git.git_verbose_check_call('submodule', 'deinit', '-f', '--all')
+        modules_path = git.cwd / '.git' / 'modules'
+        if modules_path.exists():
+            shutil.rmtree(modules_path)
+        git.git_verbose_check_call('submodule', 'update', '--init', '--depth', '1', '--recursive')
+    else:
+        git.git_verbose_check_call(
+            'submodule', 'foreach', '--recursive', 'git', 'clean', '-f', ';', 'git', 'checkout', '.'
+        )
+        git.git_verbose_check_call('pull', '--recurse-submodules', '--force')
+
+        if cleanup:
+            git.git_verbose_check_call(
+                'submodule', 'foreach', '--recursive', 'git', 'gc', '--aggressive', '--prune=now'
+            )
+
+
+@app.command
+def update_submodules(
+    cleanup: Annotated[
+        bool,
+        tyro.conf.arg(help='Cleanup unnecessary files and optimize the local repository, too?'),
+    ] = True,
+    shallow_clone: Annotated[
+        bool,
+        tyro.conf.arg(help='Submodules only a shallow clone with --depth=1?'),
+    ] = False,
+    verbosity: TyroVerbosityArgType = 1,
+):
+    """
+    Updates MicroPythonOS git submodules only.
+    Use "mposcli update" to update the main repository and optionally the submodules as well.
+    see: https://docs.micropythonos.com/os-development/linux/#optional-updating-the-code
+    """
+    setup_logging(verbosity=verbosity)
+    mpos_path = get_mpos_path()
+    git = Git(cwd=mpos_path)
+    _update_submodules(git, cleanup=cleanup, shallow_clone=shallow_clone)
+
+
+@app.command
+def update(
+    cleanup: Annotated[
+        bool,
+        tyro.conf.arg(help='Cleanup unnecessary files and optimize the local repository, too?'),
+    ] = True,
+    shallow_clone: Annotated[
+        bool,
+        tyro.conf.arg(help='Submodules only a shallow clone with --depth=1?'),
+    ] = False,
+    verbosity: TyroVerbosityArgType = 1,
+):
+    """
+    Update MicroPythonOS repository. Assume that there is a "origin" and/or "upstream" remote configured.
+    Will also ask if you want to update the submodules as well, which is recommended.
+    """
+    setup_logging(verbosity=verbosity)
+    mpos_path = get_mpos_path()
+    git = Git(cwd=mpos_path)
+
+    main_branch_name = git.get_main_branch_name()
+    print(f'The main branch is: [yellow blue]{main_branch_name}')
+
+    git.git_verbose_check_call('fetch', '--all')
+
+    output = git.git_verbose_check_output('remote')
+    remotes = output.splitlines()
+    print(f'Git {remotes=}')
+
+    for remote_name in ('origin', 'upstream'):
+        if remote_name in remotes:
+            git.git_verbose_check_call('rebase', '--no-verify', f'{remote_name}/{main_branch_name}', exit_on_error=True)
+        else:
+            print(f'[yellow]Remote "{remote_name}" not found, skipping rebase to it.')
+
+    if cleanup:
+        print('\nCleaning up the git repository...\n')
+        git.git_verbose_check_call('gc', '--aggressive', '--prune=now')
+
+    print('\n')
+    if input('Do you want to update submodules as well? [Y/n] (default: Yes): ') in ('y', ''):
+        print('\nUpdating submodules...\n')
+        _update_submodules(git, cleanup=cleanup, shallow_clone=shallow_clone)

{mposcli-0.6.0 → mposcli-0.7.0}/mposcli/mpos_utils.py

@@ -16,7 +16,7 @@ def get_mpos_path() -> Path:
     current_path = Path().cwd().resolve()
     logger.info('Current working directory: %s', current_path)
 
-    for dir_name in ('internal_filesystem', Path('lvgl_micropython', 'build')):
+    for dir_name in ('internal_filesystem', 'lvgl_micropython'):
         dir_path = current_path / dir_name
         logger.debug('Checking for directory: %s', dir_path)
         if not dir_path.is_dir():

{mposcli-0.6.0 → mposcli-0.7.0}/mposcli/utilities/mpremote.py

@@ -45,20 +45,25 @@ class MpOsPathResolver:
         return local_path_str, remote_str
 
 
-def start_mpremote_repl(max_try=10, wait_time=1):
-    print('Starting mpremote REPL...')
-    time.sleep(wait_time)
-    mpremote_bin = get_mpremote_bin()
-
-    popen_args = (mpremote_bin, 'repl')
-
+def check_call_loop(*, popen_args, max_try=10, wait_time=1, **popen_kwargs):
     for try_count in range(max_try):
         print(f'\n+ {shlex.join(str(arg) for arg in popen_args)}')
         try:
-            return subprocess.check_call(popen_args)
+            return subprocess.check_call(popen_args, **popen_kwargs)
         except subprocess.CalledProcessError as err:
             print(
                 f'[yellow]mpremote finished with [red]exit code {err.returncode!r}[/red]'
                 f' Retrying in {wait_time} seconds... (try {try_count + 1}/{max_try})'
             )
             time.sleep(wait_time)
+    raise RuntimeError(f'mpremote failed after {max_try} attempts')
+
+
+def start_mpremote_repl(max_try=10, wait_time=1):
+    print('Starting mpremote REPL...')
+    mpremote_bin = get_mpremote_bin()
+    return check_call_loop(
+        popen_args=(mpremote_bin, 'repl'),
+        max_try=max_try,
+        wait_time=wait_time,
+    )

mposcli-0.6.0/mposcli/cli_app/update.py

@@ -1,61 +0,0 @@
-import logging
-
-from cli_base.cli_tools.git import Git
-from cli_base.cli_tools.verbosity import setup_logging
-from cli_base.tyro_commands import TyroVerbosityArgType
-from rich import print
-
-from mposcli.cli_app import app
-from mposcli.mpos_utils import get_mpos_path
-
-
-logger = logging.getLogger(__name__)
-
-
-def _update_submodules(git: Git):
-    git.git_verbose_check_call('submodule', 'foreach', '--recursive', 'git', 'clean', '-f', ';', 'git', 'checkout', '.')
-    git.git_verbose_check_call('pull', '--recurse-submodules', '--force')
-
-
-@app.command
-def update_submodules(verbosity: TyroVerbosityArgType = 1):
-    """
-    Updates MicroPythonOS git submodules only.
-    Use "mposcli update" to update the main repository and optionally the submodules as well.
-    see: https://docs.micropythonos.com/os-development/linux/#optional-updating-the-code
-    """
-    setup_logging(verbosity=verbosity)
-    mpos_path = get_mpos_path()
-    git = Git(cwd=mpos_path)
-    _update_submodules(git)
-
-
-@app.command
-def update(verbosity: TyroVerbosityArgType = 1):
-    """
-    Update MicroPythonOS repository. Assume that there is a "origin" and/or "upstream" remote configured.
-    Will also ask if you want to update the submodules as well, which is recommended.
-    """
-    setup_logging(verbosity=verbosity)
-    mpos_path = get_mpos_path()
-    git = Git(cwd=mpos_path)
-
-    main_branch_name = git.get_main_branch_name()
-    print(f'The main branch is: [yellow blue]{main_branch_name}')
-
-    git.git_verbose_check_call('fetch', '--all')
-
-    output = git.git_verbose_check_output('remote')
-    remotes = output.splitlines()
-    print(f'Git {remotes=}')
-
-    for remote_name in ('origin', 'upstream'):
-        if remote_name in remotes:
-            git.git_verbose_check_call('rebase', '--no-verify', f'{remote_name}/{main_branch_name}', exit_on_error=True)
-        else:
-            print(f'[yellow]Remote "{remote_name}" not found, skipping rebase to it.')
-
-    print('\n')
-    if input('Do you want to update submodules as well? [Y/n] (default: Yes): ') in ('y', ''):
-        print('\nUpdating submodules...\n')
-        _update_submodules(git)