mposcli 0.7.1__tar.gz → 0.8.0__tar.gz

{mposcli-0.7.1 → mposcli-0.8.0}/.pre-commit-config.yaml

@@ -2,6 +2,6 @@
 # See https://pre-commit.com for more information
 repos:
   - repo: https://github.com/jedie/cli-base-utilities
-    rev: v0.28.0
+    rev: v0.29.0
     hooks:
       - id: update-readme-history

{mposcli-0.7.1 → mposcli-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mposcli
-Version: 0.7.1
+Version: 0.8.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
@@ -97,13 +97,13 @@ submodules,version}
 
 [comment]: <> (✂✂✂ auto generated build start ✂✂✂)
 ```
-usage: mposcli build [-h] [{esp32,esp32s3,unphone,unix,macOS}] [-v]
+usage: mposcli build [-h] [{esp32,esp32-small,esp32s3,unphone,unix,macOS}] [-v]
 
 Build MicroPythonOS by calling: ./scripts/build_mpos.sh <target> see:
 https://docs.micropythonos.com/os-development/
 
 ╭─ positional arguments ───────────────────────────────────────────────────╮
-│ [{esp32,esp32s3,unphone,unix,macOS}]                                     │
+│ [{esp32,esp32-small,esp32s3,unphone,unix,macOS}]                         │
 │                  Target platform to build for. (default: unix)           │
 ╰──────────────────────────────────────────────────────────────────────────╯
 ╭─ options ────────────────────────────────────────────────────────────────╮
@@ -244,8 +244,7 @@ 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] [--cleanup | --no-cleanup] [--shallow-clone | --no-shallow-
-clone] [-v]
+usage: mposcli update [-h] [UPDATE OPTIONS]
 
 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
@@ -257,7 +256,11 @@ recommended.
 │                  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)      │
+│                  Submodules only a shallow clone with --depth=1? (default: True)       │
+│ --reset-submodules, --no-reset-submodules                                              │
+│                  Drop and recreate all submodules? (Takes a while) (default: False)    │
+│ --jobs INT       git submodule update --jobs argument, i.e. how many submodules to     │
+│                  update in parallel (default: 16)                                      │
 │ -v, --verbosity  Verbosity level; e.g.: -v, -vv, -vvv, etc. (repeatable)               │
 ╰────────────────────────────────────────────────────────────────────────────────────────╯
 ```
@@ -271,8 +274,7 @@ recommended.
 
 [comment]: <> (✂✂✂ auto generated update-submodules start ✂✂✂)
 ```
-usage: mposcli update-submodules [-h] [--cleanup | --no-cleanup] [--shallow-clone | --no-
-shallow-clone] [-v]
+usage: mposcli update-submodules [-h] [UPDATE-SUBMODULES OPTIONS]
 
 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-
@@ -284,7 +286,11 @@ development/linux/#optional-updating-the-code
 │                  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)      │
+│                  Submodules only a shallow clone with --depth=1? (default: True)       │
+│ --reset-submodules, --no-reset-submodules                                              │
+│                  Drop and recreate all submodules? (Takes a while) (default: False)    │
+│ --jobs INT       git submodule update --jobs argument, i.e. how many submodules to     │
+│                  update in parallel (default: 16)                                      │
 │ -v, --verbosity  Verbosity level; e.g.: -v, -vv, -vvv, etc. (repeatable)               │
 ╰────────────────────────────────────────────────────────────────────────────────────────╯
 ```
@@ -355,6 +361,11 @@ completion,test,update,update-readme-history,update-test-snapshot-files,version}
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v0.8.0](https://github.com/jedie/mposcli/compare/v0.7.1...v0.8.0)
+  * 2026-04-08 - Update build targets
+  * 2026-04-08 - Enhance git submodule update
+  * 2026-04-08 - update requirements
+  * 2026-03-31 - Fix local <-> device filesystem mapping
 * [v0.7.1](https://github.com/jedie/mposcli/compare/v0.7.0...v0.7.1)
   * 2026-03-24 - Warn if non executeable build found
   * 2026-03-24 - Set log level to WARNING as default
@@ -363,14 +374,14 @@ completion,test,update,update-readme-history,update-test-snapshot-files,version}
   * 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
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.5.0](https://github.com/jedie/mposcli/compare/v0.4.1...v0.5.0)
   * 2026-03-08 - update README
   * 2026-03-05 - Enhance "cp" command and auto restart "mpremote repl"
   * 2026-03-03 - Refactor "cp" command
   * 2026-03-03 - flash command: use port auto detection as default
-
-<details><summary>Expand older history entries ...</summary>
-
 * [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
 * [v0.4.0](https://github.com/jedie/mposcli/compare/v0.3.0...v0.4.0)

{mposcli-0.7.1 → mposcli-0.8.0}/README.md

@@ -82,13 +82,13 @@ submodules,version}
 
 [comment]: <> (✂✂✂ auto generated build start ✂✂✂)
 ```
-usage: mposcli build [-h] [{esp32,esp32s3,unphone,unix,macOS}] [-v]
+usage: mposcli build [-h] [{esp32,esp32-small,esp32s3,unphone,unix,macOS}] [-v]
 
 Build MicroPythonOS by calling: ./scripts/build_mpos.sh <target> see:
 https://docs.micropythonos.com/os-development/
 
 ╭─ positional arguments ───────────────────────────────────────────────────╮
-│ [{esp32,esp32s3,unphone,unix,macOS}]                                     │
+│ [{esp32,esp32-small,esp32s3,unphone,unix,macOS}]                         │
 │                  Target platform to build for. (default: unix)           │
 ╰──────────────────────────────────────────────────────────────────────────╯
 ╭─ options ────────────────────────────────────────────────────────────────╮
@@ -229,8 +229,7 @@ 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] [--cleanup | --no-cleanup] [--shallow-clone | --no-shallow-
-clone] [-v]
+usage: mposcli update [-h] [UPDATE OPTIONS]
 
 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
@@ -242,7 +241,11 @@ recommended.
 │                  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)      │
+│                  Submodules only a shallow clone with --depth=1? (default: True)       │
+│ --reset-submodules, --no-reset-submodules                                              │
+│                  Drop and recreate all submodules? (Takes a while) (default: False)    │
+│ --jobs INT       git submodule update --jobs argument, i.e. how many submodules to     │
+│                  update in parallel (default: 16)                                      │
 │ -v, --verbosity  Verbosity level; e.g.: -v, -vv, -vvv, etc. (repeatable)               │
 ╰────────────────────────────────────────────────────────────────────────────────────────╯
 ```
@@ -256,8 +259,7 @@ recommended.
 
 [comment]: <> (✂✂✂ auto generated update-submodules start ✂✂✂)
 ```
-usage: mposcli update-submodules [-h] [--cleanup | --no-cleanup] [--shallow-clone | --no-
-shallow-clone] [-v]
+usage: mposcli update-submodules [-h] [UPDATE-SUBMODULES OPTIONS]
 
 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-
@@ -269,7 +271,11 @@ development/linux/#optional-updating-the-code
 │                  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)      │
+│                  Submodules only a shallow clone with --depth=1? (default: True)       │
+│ --reset-submodules, --no-reset-submodules                                              │
+│                  Drop and recreate all submodules? (Takes a while) (default: False)    │
+│ --jobs INT       git submodule update --jobs argument, i.e. how many submodules to     │
+│                  update in parallel (default: 16)                                      │
 │ -v, --verbosity  Verbosity level; e.g.: -v, -vv, -vvv, etc. (repeatable)               │
 ╰────────────────────────────────────────────────────────────────────────────────────────╯
 ```
@@ -340,6 +346,11 @@ completion,test,update,update-readme-history,update-test-snapshot-files,version}
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v0.8.0](https://github.com/jedie/mposcli/compare/v0.7.1...v0.8.0)
+  * 2026-04-08 - Update build targets
+  * 2026-04-08 - Enhance git submodule update
+  * 2026-04-08 - update requirements
+  * 2026-03-31 - Fix local <-> device filesystem mapping
 * [v0.7.1](https://github.com/jedie/mposcli/compare/v0.7.0...v0.7.1)
   * 2026-03-24 - Warn if non executeable build found
   * 2026-03-24 - Set log level to WARNING as default
@@ -348,14 +359,14 @@ completion,test,update,update-readme-history,update-test-snapshot-files,version}
   * 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
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.5.0](https://github.com/jedie/mposcli/compare/v0.4.1...v0.5.0)
   * 2026-03-08 - update README
   * 2026-03-05 - Enhance "cp" command and auto restart "mpremote repl"
   * 2026-03-03 - Refactor "cp" command
   * 2026-03-03 - flash command: use port auto detection as default
-
-<details><summary>Expand older history entries ...</summary>
-
 * [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
 * [v0.4.0](https://github.com/jedie/mposcli/compare/v0.3.0...v0.4.0)

mposcli-0.8.0/dist/.gitignore

@@ -0,0 +1 @@
+*

{mposcli-0.7.1 → mposcli-0.8.0}/mposcli/__init__.py

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

{mposcli-0.7.1 → mposcli-0.8.0}/mposcli/cli_app/build.py

@@ -18,7 +18,7 @@ logger = logging.getLogger(__name__)
 @app.command
 def build(
     target: Annotated[
-        Literal['esp32', 'esp32s3', 'unphone', 'unix', 'macOS'],
+        Literal['esp32', 'esp32-small', 'esp32s3', 'unphone', 'unix', 'macOS'],
         tyro.conf.arg(
             help='Target platform to build for.',
         ),

{mposcli-0.7.1 → mposcli-0.8.0}/mposcli/cli_app/copy_mpos.py

@@ -58,10 +58,10 @@ def cp(
 
     if not local_path:
         # Let's the user select from the list of the newest modified files in internal_filesystem/lib/mpos:
-        local_path = get_newest_files(resolver.lib_mpos, limit=new_file_limit)
+        local_path = get_newest_files(resolver.internal_fs, limit=new_file_limit)
         if not local_path:
             print('Copy/update all files in lib/mpos to the device')
-            local_path = resolver.lib_mpos
+            local_path = resolver.internal_fs
 
     print(f'Copy/update app: "{local_path}" ...')
 

{mposcli-0.7.1 → mposcli-0.8.0}/mposcli/cli_app/update.py

@@ -14,24 +14,36 @@ from mposcli.shared_tyro import DEFAULT_VERBOSITY, TyroVerbosityArgType
 
 logger = logging.getLogger(__name__)
 
+GIT_JOBS_DEFAULT = 16
 
-def _update_submodules(git: Git, *, cleanup, shallow_clone):
-    if shallow_clone:
-        git.git_verbose_check_call('submodule', 'deinit', '-f', '--all')
+
+def _update_submodules(git: Git, *, cleanup, shallow_clone, reset_submodules, jobs: int):
+    if reset_submodules:
+        git.git_verbose_check_call('submodule', 'deinit', '--force', '--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')
+        git.git_verbose_check_call('gc', '--aggressive', '--prune=now')
+
+        args = ('submodule', 'update', '--init', '--recursive', '--jobs', str(jobs))
+        if shallow_clone:
+            args += ('--depth', '1')
+        git.git_verbose_check_call(*args)
     else:
+        git.git_verbose_check_call('submodule', 'sync', '--recursive')
+        git.git_verbose_check_call('submodule', 'foreach', '--recursive', 'git', 'reset', '--hard')
+        git.git_verbose_check_call('submodule', 'foreach', '--recursive', 'git', 'clean', '-ffdx')
+        git.git_verbose_check_call('submodule', 'foreach', '--recursive', 'git', 'fetch', '--all', '--jobs', str(jobs))
+
+        args = ('submodule', 'update', '--init', '--recursive', '--force', '--jobs', str(jobs))
+        if shallow_clone:
+            args += ('--depth', '1')
+        git.git_verbose_check_call(*args)
+
+    if cleanup:
         git.git_verbose_check_call(
-            'submodule', 'foreach', '--recursive', 'git', 'clean', '-f', ';', 'git', 'checkout', '.'
+            'submodule', 'foreach', '--recursive', 'git', 'gc', '--prune=now',
         )
-        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
@@ -43,7 +55,15 @@ def update_submodules(
     shallow_clone: Annotated[
         bool,
         tyro.conf.arg(help='Submodules only a shallow clone with --depth=1?'),
+    ] = True,
+    reset_submodules: Annotated[
+        bool,
+        tyro.conf.arg(help='Drop and recreate all submodules? (Takes a while)'),
     ] = False,
+    jobs: Annotated[
+        int,
+        tyro.conf.arg(help='git submodule update --jobs argument, i.e. how many submodules to update in parallel'),
+    ] = GIT_JOBS_DEFAULT,
     verbosity: TyroVerbosityArgType = DEFAULT_VERBOSITY,
 ):
     """
@@ -54,7 +74,7 @@ def update_submodules(
     setup_logging(verbosity=verbosity)
     mpos_path = get_mpos_path()
     git = Git(cwd=mpos_path)
-    _update_submodules(git, cleanup=cleanup, shallow_clone=shallow_clone)
+    _update_submodules(git, cleanup=cleanup, shallow_clone=shallow_clone, reset_submodules=reset_submodules, jobs=jobs)
 
 
 @app.command
@@ -66,7 +86,15 @@ def update(
     shallow_clone: Annotated[
         bool,
         tyro.conf.arg(help='Submodules only a shallow clone with --depth=1?'),
+    ] = True,
+    reset_submodules: Annotated[
+        bool,
+        tyro.conf.arg(help='Drop and recreate all submodules? (Takes a while)'),
     ] = False,
+    jobs: Annotated[
+        int,
+        tyro.conf.arg(help='git submodule update --jobs argument, i.e. how many submodules to update in parallel'),
+    ] = GIT_JOBS_DEFAULT,
     verbosity: TyroVerbosityArgType = DEFAULT_VERBOSITY,
 ):
     """
@@ -88,7 +116,9 @@ def update(
 
     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)
+            git.git_verbose_check_call(
+                'rebase', '--no-verify', f'{remote_name}/{main_branch_name}', '--force', exit_on_error=True
+            )
         else:
             print(f'[yellow]Remote "{remote_name}" not found, skipping rebase to it.')
 
@@ -99,4 +129,6 @@ def update(
     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)
+        _update_submodules(
+            git, cleanup=cleanup, shallow_clone=shallow_clone, reset_submodules=reset_submodules, jobs=jobs
+        )

{mposcli-0.7.1 → mposcli-0.8.0}/mposcli/tests/test_mpremote_cp_utils.py

@@ -47,14 +47,14 @@ class ProjectSetupTestCase(TestCase):
                 resolver.resolve(mpos_path / 'internal_filesystem/lib/mpos/board/'),
                 (
                     'internal_filesystem/lib/mpos/board/',
-                    ':mpos/',
+                    ':lib/mpos/',
                 ),
             )
             self.assertEqual(
                 resolver.resolve(mpos_path / 'internal_filesystem/lib/mpos/board/unphone.py'),
                 (
                     'internal_filesystem/lib/mpos/board/unphone.py',
-                    ':mpos/board/unphone.py',
+                    ':lib/mpos/board/unphone.py',
                 ),
             )
 

{mposcli-0.7.1 → mposcli-0.8.0}/mposcli/utilities/mpremote.py

@@ -3,7 +3,6 @@ import subprocess
 import time
 from pathlib import Path
 
-from bx_py_utils.path import assert_is_dir
 from rich import print
 
 from mposcli.tools import get_mpremote_bin
@@ -13,24 +12,14 @@ class MpOsPathResolver:
     def __init__(self, mpos: Path):
         self.mpos = mpos  # e.g.: ~/repos/MicroPythonOS
         self.internal_fs = mpos / 'internal_filesystem'
-        self.lib_mpos = self.internal_fs / 'lib' / 'mpos'
-        assert_is_dir(self.lib_mpos)
-        self.apps_path = self.internal_fs / 'apps'
-        assert_is_dir(self.apps_path)
 
     def resolve(self, source: Path):
         source = source.resolve()
         assert source.exists(), f'Not existing path: {source=}'
         assert source.is_relative_to(self.mpos), f'{source=} is not inside {self.mpos=}'
+        assert source.is_relative_to(self.internal_fs), f'{source=} is not inside {self.internal_fs=}'
 
-        if source.is_relative_to(self.apps_path):
-            device_base_path = self.apps_path.parent
-        elif source.is_relative_to(self.lib_mpos):
-            device_base_path = self.lib_mpos.parent
-        elif source.is_relative_to(self.internal_fs):
-            device_base_path = self.internal_fs
-        else:
-            raise ValueError(f'Path {source} is not in a recognized location')
+        device_base_path = self.internal_fs
 
         remote_path = source.relative_to(device_base_path)
         source_path = source.relative_to(self.mpos)