use version bumper

Josverl · Josverl · commit 3d0d349a36ce · 2023-05-06T17:21:27.000+02:00
Signed-off-by: Jos Verlinde &lt;jos_verlinde@hotmail.com&gt;
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -33,13 +33,13 @@
             "args": [
                 "-v",
                 "-v",
-                "publish",
-                // "--port",
-                // "esp32",
+                "merge",
+                "--version",
+                "v1.20.0",
+                "--port",
+                "esp32",
                 // "--board",
-                // "um_tinypico",
-                "--pypi",
-                "--dry-run",
+                // "PICO_W",
                 // "--build",
                 // "switch",
                 // "v1.19.1"
diff --git a/mip/full.json b/mip/full.json
@@ -26,5 +26,5 @@
         ]
     ],
     "deps": [],
-    "version": "1.11.2"
+    "version": "1.13.7"
 }
diff --git a/mip/minified.json b/mip/minified.json
@@ -22,5 +22,5 @@
         ]
     ],
     "deps": [],
-    "version": "1.11.2"
+    "version": "1.13.7"
 }
diff --git a/mip/mpy_v5.json b/mip/mpy_v5.json
@@ -2,15 +2,15 @@
     "urls": [
         [
             "createstubs_mpy.mpy",
-            "github:josverl/micropython-stubber/mip/v5/createstubs_mpy.mpy"
+            "github:josverl/micropython-stubber/mip/v5/createstubs.mpy"
         ],
         [
             "createstubs_db_mpy.mpy",
-            "github:Josverl/micropython-stubber/mip/v5/createstubs_db_mpy.mpy"
+            "github:Josverl/micropython-stubber/mip/v5/createstubs_db.mpy"
         ],
         [
             "createstubs_mem_mpy.mpy",
-            "github:Josverl/micropython-stubber/mip/v5/createstubs_mem_mpy.mpy"
+            "github:Josverl/micropython-stubber/mip/v5/createstubs_mem.mpy"
         ],
         [
             "modulelist.txt",
@@ -22,5 +22,5 @@
         ]
     ],
     "deps": [],
-    "version": "1.11.2"
+    "version": "1.13.7"
 }
diff --git a/mip/mpy_v6.json b/mip/mpy_v6.json
@@ -2,15 +2,15 @@
     "urls": [
         [
             "createstubs_mpy.mpy",
-            "github:josverl/micropython-stubber/mip/v6/createstubs_mpy.mpy"
+            "github:josverl/micropython-stubber/mip/v6/createstubs.mpy"
         ],
         [
             "createstubs_db_mpy.mpy",
-            "github:Josverl/micropython-stubber/mip/v6/createstubs_db_mpy.mpy"
+            "github:Josverl/micropython-stubber/mip/v6/createstubs_db.mpy"
         ],
         [
             "createstubs_mem_mpy.mpy",
-            "github:Josverl/micropython-stubber/mip/v6/createstubs_mem_mpy.mpy"
+            "github:Josverl/micropython-stubber/mip/v6/createstubs_mem.mpy"
         ],
         [
             "modulelist.txt",
@@ -22,5 +22,5 @@
         ]
     ],
     "deps": [],
-    "version": "1.11.2"
+    "version": "1.13.7"
 }
diff --git a/mip/v5/createstubs.py b/mip/v5/createstubs.py
@@ -20,7 +20,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.13.4"
+__version__ = "v1.13.7"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
diff --git a/mip/v5/createstubs_db.py b/mip/v5/createstubs_db.py
@@ -39,7 +39,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.13.4"
+__version__ = "v1.13.7"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
diff --git a/mip/v5/createstubs_db_min.py b/mip/v5/createstubs_db_min.py
@@ -41,7 +41,7 @@
 except Q:pass
 try:from collections import OrderedDict as c
 except Q:from ucollections import OrderedDict as c
-__version__='v1.13.4'
+__version__='v1.13.7'
 v=2
 w=2
 d=[M,'/lib','/sd/lib','/flash/lib','lib']
diff --git a/mip/v5/createstubs_db_mpy.mpy b/mip/v5/createstubs_db_mpy.mpy
diff --git a/mip/v5/createstubs_lvgl.py b/mip/v5/createstubs_lvgl.py
@@ -24,7 +24,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.13.4"
+__version__ = "v1.13.7"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
diff --git a/mip/v5/createstubs_lvgl_min.py b/mip/v5/createstubs_lvgl_min.py
@@ -41,7 +41,7 @@
 except Q:pass
 try:from collections import OrderedDict as b
 except Q:from ucollections import OrderedDict as b
-__version__='v1.13.4'
+__version__='v1.13.7'
 u=2
 v=2
 w=[L,'/lib','/sd/lib','/flash/lib','lib']
diff --git a/mip/v5/createstubs_lvgl_mpy.mpy b/mip/v5/createstubs_lvgl_mpy.mpy
diff --git a/mip/v5/createstubs_mem.py b/mip/v5/createstubs_mem.py
@@ -30,7 +30,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.13.4"
+__version__ = "v1.13.7"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
diff --git a/mip/v5/createstubs_mem_min.py b/mip/v5/createstubs_mem_min.py
@@ -40,7 +40,7 @@
 except Q:pass
 try:from collections import OrderedDict as c
 except Q:from ucollections import OrderedDict as c
-__version__='v1.13.4'
+__version__='v1.13.7'
 u=2
 v=2
 d=[L,'/lib','/sd/lib','/flash/lib','lib']
diff --git a/mip/v5/createstubs_mem_mpy.mpy b/mip/v5/createstubs_mem_mpy.mpy
diff --git a/mip/v5/createstubs_min.py b/mip/v5/createstubs_min.py
@@ -44,7 +44,7 @@
 except Q:pass
 try:from collections import OrderedDict as d
 except Q:from ucollections import OrderedDict as d
-__version__='v1.13.4'
+__version__='v1.13.7'
 x=2
 y=2
 z=[L,'/lib','/sd/lib','/flash/lib','lib']
diff --git a/mip/v5/createstubs_mpy.mpy b/mip/v5/createstubs_mpy.mpy
diff --git a/mip/v6/createstubs.py b/mip/v6/createstubs.py
@@ -20,7 +20,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.13.4"
+__version__ = "v1.13.7"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
diff --git a/mip/v6/createstubs_db.py b/mip/v6/createstubs_db.py
@@ -39,7 +39,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.13.4"
+__version__ = "v1.13.7"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
diff --git a/mip/v6/createstubs_db_min.py b/mip/v6/createstubs_db_min.py
@@ -41,7 +41,7 @@
 except Q:pass
 try:from collections import OrderedDict as c
 except Q:from ucollections import OrderedDict as c
-__version__='v1.13.4'
+__version__='v1.13.7'
 v=2
 w=2
 d=[M,'/lib','/sd/lib','/flash/lib','lib']
diff --git a/mip/v6/createstubs_db_mpy.mpy b/mip/v6/createstubs_db_mpy.mpy
diff --git a/mip/v6/createstubs_lvgl.py b/mip/v6/createstubs_lvgl.py
@@ -24,7 +24,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.13.4"
+__version__ = "v1.13.7"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
diff --git a/mip/v6/createstubs_lvgl_min.py b/mip/v6/createstubs_lvgl_min.py
@@ -41,7 +41,7 @@
 except Q:pass
 try:from collections import OrderedDict as b
 except Q:from ucollections import OrderedDict as b
-__version__='v1.13.4'
+__version__='v1.13.7'
 u=2
 v=2
 w=[L,'/lib','/sd/lib','/flash/lib','lib']
diff --git a/mip/v6/createstubs_lvgl_mpy.mpy b/mip/v6/createstubs_lvgl_mpy.mpy
diff --git a/mip/v6/createstubs_mem.py b/mip/v6/createstubs_mem.py
@@ -30,7 +30,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.13.4"
+__version__ = "v1.13.7"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
diff --git a/mip/v6/createstubs_mem_min.py b/mip/v6/createstubs_mem_min.py
@@ -40,7 +40,7 @@
 except Q:pass
 try:from collections import OrderedDict as c
 except Q:from ucollections import OrderedDict as c
-__version__='v1.13.4'
+__version__='v1.13.7'
 u=2
 v=2
 d=[L,'/lib','/sd/lib','/flash/lib','lib']
diff --git a/mip/v6/createstubs_mem_mpy.mpy b/mip/v6/createstubs_mem_mpy.mpy
diff --git a/mip/v6/createstubs_min.py b/mip/v6/createstubs_min.py
@@ -44,7 +44,7 @@
 except Q:pass
 try:from collections import OrderedDict as d
 except Q:from ucollections import OrderedDict as d
-__version__='v1.13.4'
+__version__='v1.13.7'
 x=2
 y=2
 z=[L,'/lib','/sd/lib','/flash/lib','lib']
diff --git a/mip/v6/createstubs_mpy.mpy b/mip/v6/createstubs_mpy.mpy
diff --git a/package.json b/package.json
@@ -18,5 +18,5 @@
         ]
     ],
     "deps": [],
-    "version": "1.11.2"
+    "version": "1.13.7"
 }
diff --git a/scripts/make-variants.ps1 b/scripts/make-variants.ps1
@@ -3,3 +3,6 @@
 &stubber make-variants
 &stubber make-variants --target ./mip/v6
 &stubber make-variants --target ./mip/v5 --version v1.18
+
+# todo: update version in 
+# package.json
diff --git a/scripts/mip.ps1 b/scripts/mip.ps1
@@ -0,0 +1,10 @@
+
+mpremote mip install github:josverl/micropython-stubber
+
+mpremote mip install github:josverl/micropython-stubber/mip/full.json@board_stubber
+
+mpremote mip install github:josverl/micropython-stubber/mip/minified.json@board_stubber
+
+mpremote mip install github:josverl/micropython-stubber/mip/mpy_v5.json@board_stubber
+
+mpremote mip install github:josverl/micropython-stubber/mip/mpy_v6.json@board_stubber
diff --git a/src/stubber/__init__.py b/src/stubber/__init__.py
@@ -1,3 +1,4 @@
-"""read the version from pyproject or the wheels"""
+"""get the version"""
 
-from .utils.my_version import __version__
+
+__version__ = "1.13.7"
diff --git a/src/stubber/board/createstubs.py b/src/stubber/board/createstubs.py
@@ -20,7 +20,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.13.4"
+__version__ = "v1.13.7"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
diff --git a/src/stubber/board/createstubs_db.py b/src/stubber/board/createstubs_db.py
@@ -39,7 +39,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.13.4"
+__version__ = "v1.13.7"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
diff --git a/src/stubber/board/createstubs_db_min.py b/src/stubber/board/createstubs_db_min.py
@@ -41,7 +41,7 @@
 except Q:pass
 try:from collections import OrderedDict as c
 except Q:from ucollections import OrderedDict as c
-__version__='v1.13.4'
+__version__='v1.13.7'
 v=2
 w=2
 d=[M,'/lib','/sd/lib','/flash/lib','lib']
diff --git a/src/stubber/board/createstubs_db_mpy.mpy b/src/stubber/board/createstubs_db_mpy.mpy
diff --git a/src/stubber/board/createstubs_lvgl.py b/src/stubber/board/createstubs_lvgl.py
@@ -24,7 +24,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.13.4"
+__version__ = "v1.13.7"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
diff --git a/src/stubber/board/createstubs_lvgl_min.py b/src/stubber/board/createstubs_lvgl_min.py
@@ -41,7 +41,7 @@
 except Q:pass
 try:from collections import OrderedDict as b
 except Q:from ucollections import OrderedDict as b
-__version__='v1.13.4'
+__version__='v1.13.7'
 u=2
 v=2
 w=[L,'/lib','/sd/lib','/flash/lib','lib']
diff --git a/src/stubber/board/createstubs_lvgl_mpy.mpy b/src/stubber/board/createstubs_lvgl_mpy.mpy
diff --git a/src/stubber/board/createstubs_mem.py b/src/stubber/board/createstubs_mem.py
@@ -30,7 +30,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.13.4"
+__version__ = "v1.13.7"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
diff --git a/src/stubber/board/createstubs_mem_min.py b/src/stubber/board/createstubs_mem_min.py
@@ -40,7 +40,7 @@
 except Q:pass
 try:from collections import OrderedDict as c
 except Q:from ucollections import OrderedDict as c
-__version__='v1.13.4'
+__version__='v1.13.7'
 u=2
 v=2
 d=[L,'/lib','/sd/lib','/flash/lib','lib']
diff --git a/src/stubber/board/createstubs_mem_mpy.mpy b/src/stubber/board/createstubs_mem_mpy.mpy
diff --git a/src/stubber/board/createstubs_min.py b/src/stubber/board/createstubs_min.py
@@ -44,7 +44,7 @@
 except Q:pass
 try:from collections import OrderedDict as d
 except Q:from ucollections import OrderedDict as d
-__version__='v1.13.4'
+__version__='v1.13.7'
 x=2
 y=2
 z=[L,'/lib','/sd/lib','/flash/lib','lib']
diff --git a/src/stubber/board/createstubs_mpy.mpy b/src/stubber/board/createstubs_mpy.mpy
diff --git a/src/stubber/codemod/board.py b/src/stubber/codemod/board.py
@@ -15,7 +15,7 @@
 from stubber.codemod._partials import Partial
 from stubber.codemod.modify_list import ListChangeSet, ModifyListElements
 from stubber.cst_transformer import update_module_docstr
-from stubber.utils.my_version import __version__
+from stubber import __version__
 
 # matches on `stubber = Stubber()`
 _STUBBER_MATCHER = m.Assign(
diff --git a/src/stubber/commands/cli.py b/src/stubber/commands/cli.py
@@ -5,7 +5,7 @@
 
 import click
 from loguru import logger as log
-from stubber.utils.my_version import __version__
+from stubber import __version__
 
 
 @click.group(chain=True)
diff --git a/src/stubber/get_cpython.py b/src/stubber/get_cpython.py
@@ -14,7 +14,9 @@
 
 from loguru import logger as log
 
-from . import __version__, utils
+from . import __version__
+
+from . import utils
 from .utils.config import CONFIG
 
 # # log = logging.getLogger(__name__)
diff --git a/src/stubber/publish/publish.py b/src/stubber/publish/publish.py
@@ -74,7 +74,7 @@ def publish_multiple(
     return results
 
 
-def build_worklist(family: str, versions: List[str], ports: Union[List[str], str], boards: Union[List[str], str]):
+def build_worklist(family: str, versions: Union[List[str], str], ports: Union[List[str], str], boards: Union[List[str], str]):
     """Build a worklist of packages to build or publish, and filter to only the requested ports and boards"""
     if isinstance(versions, str):
         versions = [versions]
diff --git a/src/stubber/utils/manifest.py b/src/stubber/utils/manifest.py
@@ -5,7 +5,7 @@
 from pathlib import Path
 from typing import Optional
 
-from .my_version import __version__
+from .. import __version__
 from .versions import clean_version
 
 # # log = logging.getLogger(__name__)
diff --git a/src/stubber/utils/my_version.py b/src/stubber/utils/my_version.py
diff --git a/tests/publish/test_candidates.py b/tests/publish/test_candidates.py
diff --git a/tests/t101/test_101.py b/tests/t101/test_101.py
diff --git a/tests/version_test.py b/tests/version_test.py

Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,5 @@`
`26`	`26`	`]`
`27`	`27`	`],`
`28`	`28`	`"deps": [],`
`29`		`- "version": "1.11.2"`
	`29`	`+ "version": "1.13.7"`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@`
`22`	`22`	`]`
`23`	`23`	`],`
`24`	`24`	`"deps": [],`
`25`		`- "version": "1.11.2"`
	`25`	`+ "version": "1.13.7"`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,15 @@`
`2`	`2`	`"urls": [`
`3`	`3`	`[`
`4`	`4`	`"createstubs_mpy.mpy",`
`5`		`- "github:josverl/micropython-stubber/mip/v5/createstubs_mpy.mpy"`
	`5`	`+ "github:josverl/micropython-stubber/mip/v5/createstubs.mpy"`
`6`	`6`	`],`
`7`	`7`	`[`
`8`	`8`	`"createstubs_db_mpy.mpy",`
`9`		`- "github:Josverl/micropython-stubber/mip/v5/createstubs_db_mpy.mpy"`
	`9`	`+ "github:Josverl/micropython-stubber/mip/v5/createstubs_db.mpy"`
`10`	`10`	`],`
`11`	`11`	`[`
`12`	`12`	`"createstubs_mem_mpy.mpy",`
`13`		`- "github:Josverl/micropython-stubber/mip/v5/createstubs_mem_mpy.mpy"`
	`13`	`+ "github:Josverl/micropython-stubber/mip/v5/createstubs_mem.mpy"`
`14`	`14`	`],`
`15`	`15`	`[`
`16`	`16`	`"modulelist.txt",`
`@@ -22,5 +22,5 @@`
`22`	`22`	`]`
`23`	`23`	`],`
`24`	`24`	`"deps": [],`
`25`		`- "version": "1.11.2"`
	`25`	`+ "version": "1.13.7"`
`26`	`26`	`}`