mpytool 2.3.5__tar.gz → 2.3.6__tar.gz

{mpytool-2.3.5 → mpytool-2.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mpytool
-Version: 2.3.5
+Version: 2.3.6
 Summary: MPY tool - manage files on devices running MicroPython
 Author-email: Pavel Revak <pavelrevak@gmail.com>
 License-Expression: MIT
@@ -10,6 +10,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pyserial>=3.0
+Requires-Dist: mpy-cross
 Dynamic: license-file
 
 # mpytool

{mpytool-2.3.5 → mpytool-2.3.6}/mpytool/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.3.5'
-__version_tuple__ = version_tuple = (2, 3, 5)
+__version__ = version = '2.3.6'
+__version_tuple__ = version_tuple = (2, 3, 6)
 
-__commit_id__ = commit_id = 'gc5fff94f9'
+__commit_id__ = commit_id = 'g9d48ac194'

{mpytool-2.3.5 → mpytool-2.3.6}/mpytool/mpy_cross.py

@@ -5,6 +5,7 @@ import os as _os
 import re as _re
 import shutil as _shutil
 import subprocess as _subprocess
+import sys as _sys
 
 from mpytool.logger import SimpleColorLogger as _SimpleColorLogger
 
@@ -19,6 +20,21 @@ _MPY_ARCH_NAMES = (
 BOOT_FILES = frozenset(('boot.py', 'main.py'))
 
 
+def _find_mpy_cross():
+    """Find mpy-cross binary: first in same dir as Python, then in PATH"""
+    # Look next to current Python interpreter (same venv)
+    bin_dir = _os.path.dirname(_sys.executable)
+    local = _os.path.join(bin_dir, 'mpy-cross')
+    if _os.path.isfile(local) and _os.access(local, _os.X_OK):
+        return local
+    # Windows: mpy-cross.exe
+    local_exe = local + '.exe'
+    if _os.path.isfile(local_exe) and _os.access(local_exe, _os.X_OK):
+        return local_exe
+    # Fallback to PATH
+    return _shutil.which('mpy-cross')
+
+
 class MpyCross:
     """Mpy-cross compiler wrapper with caching
 
@@ -29,6 +45,7 @@ class MpyCross:
     def __init__(self, log=None):
         self._log = log if log is not None else _SimpleColorLogger()
         self.active = False
+        self._bin = None  # path to mpy-cross binary
         self._ver = None  # (major, sub) device mpy version
         self._arch = None  # architecture name for cache key
         self._args = []  # extra mpy-cross args (-b, -march)
@@ -53,7 +70,7 @@ class MpyCross:
         Sets self.active = True on success, False on failure.
         """
         self.active = False
-        mpy_cross_bin = _shutil.which('mpy-cross')
+        mpy_cross_bin = _find_mpy_cross()
         if not mpy_cross_bin:
             self._log.warning(
                 'mpy-cross not found in PATH (pip install mpy-cross),'
@@ -99,6 +116,7 @@ class MpyCross:
         self._log.debug(
             'device v%s mpy v%d.%d%s, mpy-cross %s',
             dev_version, dev_ver, dev_sub, arch_str, cross_str)
+        self._bin = mpy_cross_bin
         self.active = True
 
     def compile(self, src_path):
@@ -106,7 +124,10 @@ class MpyCross:
 
         Skips boot.py, main.py, and non-.py files.
         Uses cache if fresh (mtime check).
+        Returns None if not active (init() not called or failed).
         """
+        if not self.active:
+            return None
         basename = _os.path.basename(src_path)
         if basename in BOOT_FILES:
             self._log.debug('mpy: skip %s (boot file)', basename)
@@ -126,7 +147,7 @@ class MpyCross:
                 return cache_path
         # Compile
         _os.makedirs(cache_dir, exist_ok=True)
-        cmd = ['mpy-cross'] + self._args + ['-o', cache_path, src_path]
+        cmd = [self._bin] + self._args + ['-o', cache_path, src_path]
         self._log.info('$ %s', ' '.join(cmd))
         result = _subprocess.run(
             cmd, capture_output=True, text=True, timeout=30)

{mpytool-2.3.5 → mpytool-2.3.6}/mpytool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mpytool
-Version: 2.3.5
+Version: 2.3.6
 Summary: MPY tool - manage files on devices running MicroPython
 Author-email: Pavel Revak <pavelrevak@gmail.com>
 License-Expression: MIT
@@ -10,6 +10,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pyserial>=3.0
+Requires-Dist: mpy-cross
 Dynamic: license-file
 
 # mpytool

{mpytool-2.3.5 → mpytool-2.3.6}/mpytool.egg-info/SOURCES.txt

@@ -37,6 +37,7 @@ tests/__init__.py
 tests/test_cli.py
 tests/test_cmd_cp.py
 tests/test_errors.py
+tests/test_helpers.py
 tests/test_integration.py
 tests/test_mount.py
 tests/test_mpy.py

{mpytool-2.3.5 → mpytool-2.3.6}/mpytool.egg-info/requires.txt

@@ -1 +1,2 @@
 pyserial>=3.0
+mpy-cross

{mpytool-2.3.5 → mpytool-2.3.6}/pyproject.toml

@@ -15,6 +15,7 @@ authors = [
 keywords = ["MPY", "micropython"]
 dependencies = [
     "pyserial>=3.0",
+    "mpy-cross",
 ]
 
 [project.urls]

{mpytool-2.3.5 → mpytool-2.3.6}/tests/test_cli.py

@@ -51,6 +51,14 @@ def requires_device_rw(cls):
     return cls
 
 
+def setUpModule():
+    """Reset device before running CLI tests"""
+    if not PORT_RO:
+        return  # No device, tests will be skipped
+    from tests.test_helpers import reset_device
+    reset_device(PORT_RO)
+
+
 # =============================================================================
 # Tests without device (always run)
 # =============================================================================

{mpytool-2.3.5 → mpytool-2.3.6}/tests/test_cmd_cp.py

@@ -738,6 +738,7 @@ class TestMpyCompilation(unittest.TestCase):
     def _setup_compiler(self, arch=None):
         """Setup compiler with active state and fake version"""
         self.compiler.active = True
+        self.compiler._bin = 'mpy-cross'
         self.compiler._ver = (6, 3)
         self.compiler._arch = arch
         self.compiler._args = []
@@ -915,9 +916,9 @@ class TestMpyCompilation(unittest.TestCase):
         self.assertEqual(call_args[0][0], compiled_data)
         self.assertEqual(call_args[0][1], '/script.mpy')
 
-    @patch('mpytool.mpy_cross._shutil.which', return_value='/usr/bin/mpy-cross')
+    @patch('mpytool.mpy_cross._find_mpy_cross', return_value='/usr/bin/mpy-cross')
     @patch('mpytool.mpy_cross._subprocess.run')
-    def test_init_version_match(self, mock_run, mock_which):
+    def test_init_version_match(self, mock_run, mock_find):
         """init should succeed when versions match"""
         mock_run.return_value = Mock(
             returncode=0,
@@ -930,9 +931,9 @@ class TestMpyCompilation(unittest.TestCase):
         self.assertEqual(self.compiler._ver, (6, 3))
         self.assertIn('-march=armv6m', self.compiler._args)
 
-    @patch('mpytool.mpy_cross._shutil.which', return_value='/usr/bin/mpy-cross')
+    @patch('mpytool.mpy_cross._find_mpy_cross', return_value='/usr/bin/mpy-cross')
     @patch('mpytool.mpy_cross._subprocess.run')
-    def test_init_version_mismatch_uses_b_flag(self, mock_run, mock_which):
+    def test_init_version_mismatch_uses_b_flag(self, mock_run, mock_find):
         """init should use -b flag on version mismatch"""
         mock_run.return_value = Mock(
             returncode=0,
@@ -947,8 +948,8 @@ class TestMpyCompilation(unittest.TestCase):
         self.assertIn('6.1', self.compiler._args)
         self.assertIn('-march=xtensawin', self.compiler._args)
 
-    @patch('mpytool.mpy_cross._shutil.which', return_value=None)
-    def test_init_not_found(self, mock_which):
+    @patch('mpytool.mpy_cross._find_mpy_cross', return_value=None)
+    def test_init_not_found(self, mock_find):
         """init should deactivate when mpy-cross not in PATH"""
         self.compiler._log = Mock()
         self.compiler.init({'mpy_ver': 6, 'mpy_sub': 3, 'version': '1.24.0'})

mpytool-2.3.6/tests/test_helpers.py

@@ -0,0 +1,24 @@
+"""Shared test helpers for integration and CLI tests"""
+
+
+def reset_device(port):
+    """Reset device before tests and wait for it to be ready
+
+    Tries hardware reset first (USB-UART), falls back to soft reset (CDC).
+    Actively waits for REPL to be ready (no fixed sleep).
+    """
+    from mpytool import ConnSerial, Mpy
+    from mpytool.conn import ConnError
+
+    conn = ConnSerial(port=port, baudrate=115200)
+    mpy = Mpy(conn)
+    try:
+        # Try hardware reset first (USB-UART only)
+        conn.hard_reset()
+    except ConnError:
+        # CDC devices don't support hardware reset, use soft reset
+        mpy.soft_reset()
+    # Wait for device to boot and REPL to be ready
+    mpy.comm._repl_mode = None  # Force re-detection
+    mpy.comm.stop_current_operation()
+    conn.close()

{mpytool-2.3.5 → mpytool-2.3.6}/tests/test_integration.py

@@ -53,6 +53,14 @@ def requires_device_rw(cls):
 requires_device_wipe = requires_device_rw
 
 
+def setUpModule():
+    """Reset device before running integration tests"""
+    if not PORT_RO:
+        return  # No device, tests will be skipped
+    from tests.test_helpers import reset_device
+    reset_device(PORT_RO)
+
+
 @requires_device
 class TestDeviceConnection(unittest.TestCase):
     """Test basic device connection"""