change package to mpy-cross-v6.1

MicroPython v1.20 bumped the MPY minor version to v6.1 so we need a new
package to allow targeting both MPY v6 and v6.1 at the same time.

Author: dlech

.github/workflows/publish.yml

@@ -3,12 +3,12 @@ name: Build and upload to PyPI
 on:
   push:
     branches:
-      - mpy-cross-v6
+      - mpy-cross-v6.1
     tags:
-      - mpy-cross-v6/*
+      - mpy-cross-v6.1/*
   pull_request:
     branches:
-      - mpy-cross-v6
+      - mpy-cross-v6.1
 
 jobs:
   build_wheels:
@@ -68,4 +68,4 @@ jobs:
       - uses: pypa/[email protected]
         with:
           user: __token__
-          password: ${{ secrets.PYPI_TOKEN2 }}
+          password: ${{ secrets.PYPI_TOKEN3 }}

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "micropython"]
 	path = micropython
 	url = https://github.com/pybricks/micropython.git
-	branch = python-mpy-cross-v6
+	branch = python-mpy-cross-v6.1

.vscode/settings.json

@@ -2,5 +2,6 @@
     "[python]": {
         "editor.defaultFormatter": "ms-python.python",
         "editor.formatOnSave": true
-    }
+    },
+    "python.formatting.provider": "black"
 }

MANIFEST.in

@@ -1,8 +1,6 @@
 recursive-include micropython py/** mpy-cross/** shared/** tools/**
 include micropython/docs/conf.py
-exclude micropython/mpy-cross/mpy-cross*
-include micropython/mpy-cross/mpy-cross.vcxproj
 prune micropython/mpy-cross/build*
 prune micropython/ports*
-exclude src/mpy_cross_v6/mpy-cross*
-prune src/mpy_cross_v6.egg-info
+exclude src/mpy_cross_v6.1/mpy-cross*
+prune src/mpy_cross_v6.1.egg-info

README.md

@@ -10,6 +10,10 @@ For MicroPython 1.12 to 1.18:
 
     pip install mpy-cross-v5
 
-For MicroPython 1.19+:
+For MicroPython 1.19:
 
     pip install mpy-cross-v6
+
+For MicroPython 1.20+:
+
+    pip install mpy-cross-v6.1

micropython

@@ -3,19 +3,19 @@ requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "mpy-cross-v6"
-version = "1.0.1"
+name = "mpy-cross-v6.1"
+version = "1.0.0"
 description = "Python wrapper for the mpy-cross tool from MicroPython."
 readme = "README.md"
 
 [project.scripts]
-mpy-cross-v6 = "mpy_cross_v6:_run"
+"mpy-cross-v6.1" = "mpy_cross_v6_1:_run"
 
 [tool.setuptools.packages.find]
 where = ["src"]
 
 [tool.setuptools.package-data]
-mpy_cross_v6 = ["mpy-cross*"]
+mpy_cross_v6_1 = ["mpy-cross*"]
 
 [tool.pytest.ini_options]
 pythonpath = ["build/lib"]

pyproject.toml

@@ -10,9 +10,6 @@
 
 PROJECT_DIR = pathlib.Path(__file__).parent
 MPY_CROSS_DIR = PROJECT_DIR / "micropython" / "mpy-cross"
-MPY_CROSS_EXE = (MPY_CROSS_DIR / "mpy-cross").with_suffix(
-    ".exe" if platform.system() == "Windows" else ""
-)
 
 # map of distutils platform id to compiler target triple
 PLAT_TO_CLANG_TARGET = {
@@ -27,9 +24,13 @@ class custom_build(build):
     def run(self):
         super().run()
 
+        mpy_cross_exe = (
+            MPY_CROSS_DIR / f"build-{self.plat_name}" / "mpy-cross"
+        ).with_suffix(".exe" if platform.system() == "Windows" else "")
+
         # all builds put exe in the same place, so we have to remove to avoid
         # make not rebuilding for different arch
-        MPY_CROSS_EXE.unlink(missing_ok=True)
+        mpy_cross_exe.unlink(missing_ok=True)
 
         make_command = [
             "make",
@@ -51,7 +52,7 @@ def run(self):
 
         subprocess.check_call(make_command)
 
-        shutil.copy(str(MPY_CROSS_EXE), self.build_lib + "/mpy_cross_v6")
+        shutil.copy(str(mpy_cross_exe), self.build_lib + "/mpy_cross_v6_1")
 
 
 class custom_install(install):