Merge pull request #535 from Josverl/dev/mpflash_stable

Dev/mpflash stable
Josverl · Apr 29, 2024 · 61550e3 · 61550e3
2 parents 76fc906 + 87874ab
commit 61550e3
Show file tree

Hide file tree

Showing 113 changed files with 10,394 additions and 4,481 deletions.
diff --git a/.github/codecov.yml b/.github/codecov.yml
@@ -11,7 +11,7 @@ codecov:
 
 flag_management:
   default_rules: # the rules that will be followed for any flag added, generally
-    carryforward: true
+    # carryforward: true
     statuses:
       - type: project
         target: auto
@@ -22,11 +22,11 @@ flag_management:
     - name: stubber
       paths: 
       - src/stubber
-      carryforward: true
+      # carryforward: true
     - name: mpflash
       paths: 
       - src/mpflash
-      carryforward: true
+      # carryforward: true
       statuses:
       - type: project
         target: 20%

diff --git a/.github/workflows/mip.yml b/.github/workflows/mip.yml
@@ -7,7 +7,9 @@ on:
   workflow_dispatch:
   push:
     paths:
+      - .github/workflows/mip.yml
       - "src/stubber/board/**"
+
 
 jobs:
   mip:
@@ -25,7 +27,7 @@ jobs:
           cache: "poetry"
 
       - name: Install stubber
-        run: poetry install --with dev --no-interaction
+        run: poetry install --with test --no-interaction
 
       - name: make all variants
         run: |

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -18,6 +18,7 @@ on:
         branches: [main, dev/*, feat/*, fix/*]
         paths:
             - .github/workflows/pytest.yml
+            - .github/workflows/codecov.yml
             - "src/stubber/**"
             - "tests/**"
             - "**/pyproject.toml"
@@ -39,18 +40,22 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                os: [ubuntu-latest, windows-latest, macos-13 ] # macos-latest
+                os: [ubuntu-latest, windows-latest, macos-13]
                 python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
                 include: # for testing
+                    - os: windows-latest
+                      python-version: "3.11"
                     - os: ubuntu-latest
                       python-version: "3.11"
                     - os: macos-13
                       python-version: "3.11"
-                exclude: # avoid black install problem for these versions on macos
-                    - os: macos-latest
-                      python-version: "3.9"
-                    - os: macos-latest
-                      python-version: "3.10"
+
+                    # - os: flyci-macos-large-latest-m2 # fails on pipx
+                    #   python-version: "3.11"
+                    # - os: macos-latest-large    # Paid
+                    #   python-version: "3.11"
+                    # - os: macos-13-xlarge       # Paid
+                    #   python-version: "3.11"
 
         steps:
             - name: Checkout repository
@@ -80,7 +85,11 @@ jobs:
             # install project
             #----------------------------------------------
             - name: Install test dependencies
-              run: poetry install --with test
+              run: |
+                  poetry install --with test
+                  # use the latest source version of mpflash
+                  pip uninstall mpflash
+                  pip install src/mpflash
 
             #----------------------------------------------
             # stubber clone

diff --git a/.github/workflows/pytest_mpflash.yml b/.github/workflows/pytest_mpflash.yml
@@ -14,6 +14,7 @@ on:
         branches: [main, dev/*, feat/*, fix/*]
         paths:
             - .github/workflows/pytest_mpflash.yml
+            - .github/workflows/codecov.yml            
             - "src/mpflash/**"
 
 env:

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -36,8 +36,10 @@
                 // "--ignore",
                 // "/dev/ttyAMA0",
                 "flash",
-                "--version",
-                "?",
+                // "--board",
+                // "SEEED_WIO_TERMINAL",
+                // "--version",
+                // "?",
                 // "preview",
                 // "--board",
                 // "--no-erase",
@@ -46,8 +48,6 @@
                 // "/dev/ttyACM0",
                 // "--port",
                 // "samd",
-                "--board",
-                "SEEED_WIO_TERMINAL",
             ]
         },
         {

diff --git a/data/micropython-v1_22_2-esp32c3.txt b/data/micropython-v1_22_2-esp32c3.txt
@@ -0,0 +1,19 @@
+# MicroPython v1.22.2 on 2024-02-22; ESP32C3 module with ESP32C3
+
+__main__          bluetooth         heapq             select
+_asyncio          btree             inisetup          socket
+_boot             builtins          io                ssl
+_espnow           cmath             json              struct
+_onewire          collections       machine           sys
+_thread           cryptolib         math              time
+_webrepl          deflate           micropython       uasyncio
+aioespnow         dht               mip/__init__      uctypes
+apa106            ds18x20           neopixel          umqtt/robust
+array             errno             network           umqtt/simple
+asyncio/__init__  esp               ntptime           upysh
+asyncio/core      esp32             onewire           urequests
+asyncio/event     espnow            os                webrepl
+asyncio/funcs     flashbdev         platform          webrepl_setup
+asyncio/lock      framebuf          random            websocket
+asyncio/stream    gc                re
+binascii          hashlib           requests/__init__
diff --git a/data/micropython-v2_0_0-preview.txt b/data/micropython-v2_0_0-preview.txt
@@ -0,0 +1,4 @@
+# https://docs.micropython.org/en/latest/reference/micropython2_migration.html
+# Introduction of a new module vfs
+
+vfs
diff --git a/mip/full.json b/mip/full.json
@@ -18,5 +18,5 @@
     ]
   ],
   "deps": [],
-  "version": "1.17.6"
+  "version": "1.20.0"
 }
diff --git a/mip/minified.json b/mip/minified.json
@@ -18,5 +18,5 @@
     ]
   ],
   "deps": [],
-  "version": "1.17.6"
+  "version": "1.20.0"
 }
diff --git a/mip/mpy_v5.json b/mip/mpy_v5.json
@@ -18,5 +18,5 @@
     ]
   ],
   "deps": [],
-  "version": "1.17.6"
+  "version": "1.20.0"
 }
diff --git a/mip/mpy_v6.json b/mip/mpy_v6.json
@@ -18,5 +18,5 @@
     ]
   ],
   "deps": [],
-  "version": "1.17.6"
+  "version": "1.20.0"
 }
diff --git a/mip/v5/createstubs.py b/mip/v5/createstubs.py
@@ -24,7 +24,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.17.6"
+__version__ = "v1.20.0"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -951,6 +951,7 @@ def main():
         "uwebsocket",
         "uzlib",
         "version",
+        "vfs",
         "websocket",
         "websocket_helper",
         "wipy",

diff --git a/mip/v5/createstubs_db.py b/mip/v5/createstubs_db.py
@@ -18,7 +18,7 @@
     - cross compilation, using mpy-cross, to avoid the compilation step on the micropython device 
 
 
-This variant was generated from createstubs.py by micropython-stubber v1.17.6
+This variant was generated from createstubs.py by micropython-stubber v1.20.0
 """
 
 # Copyright (c) 2019-2024 Jos Verlinde
@@ -43,7 +43,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.17.6"
+__version__ = "v1.20.0"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]