Merge branch 'cdc' into moat

Author: smurfix

.github/workflows/build_packages.yml

@@ -23,7 +23,7 @@ jobs:
       if: vars.MICROPY_PUBLISH_MIP_INDEX && github.event_name == 'push' && ! github.event.deleted
       run: source tools/ci.sh && ci_push_package_index
     - name: Upload packages as artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: packages-${{ github.sha }}
         path: ${{ env.PACKAGE_INDEX_PATH }}

micropython/mip/manifest.py

@@ -1,4 +1,4 @@
-metadata(version="0.4.0", description="On-device package installer for network-capable boards")
+metadata(version="0.4.1", description="On-device package installer for network-capable boards")
 
 require("requests")
 

micropython/mip/mip/__init__.py

@@ -171,7 +171,7 @@ def _install_package(package, index, target, version, mpy):
 def install(package, index=None, target=None, version=None, mpy=True):
     if not target:
         for p in sys.path:
-            if p.endswith("/lib"):
+            if not p.startswith("/rom") and p.endswith("/lib"):
                 target = p
                 break
         else:

micropython/usb/usb-device-cdc/usb/device/cdc.py

@@ -350,10 +350,9 @@ def _rd_cb(self, ep, res, num_bytes):
     ###
 
     def write(self, buf):
-        # use a memoryview to track how much of 'buf' we've written so far
-        # (unfortunately, this means a 1 block allocation for each write, but it's otherwise allocation free.)
         start = time.ticks_ms()
-        mv = memoryview(buf)
+        # use a memoryview to track partial writes
+        mv = buf
         while True:
             # Keep pushing buf into _wb into it's all gone
             nbytes = self._wb.write(mv)
@@ -362,6 +361,8 @@ def write(self, buf):
             if nbytes == len(mv):
                 return len(buf)  # Success
 
+            if mv is buf:
+                mv = memoryview(buf)
             mv = mv[nbytes:]
 
             # check for timeout