From aa4d86d6171f272645a525a68027c8c9cb0f10b5 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 4 May 2024 16:10:31 -0500
Subject: [PATCH] update for mpy-cross v6.2

- New package name/module name/etc.
- Update micropython submodule to v1.22.
---
 .github/workflows/publish.yml                      | 8 ++++----
 .gitmodules                                        | 2 +-
 MANIFEST.in                                        | 4 ++--
 README.md                                          | 6 +++++-
 micropython                                        | 2 +-
 pyproject.toml                                     | 6 +++---
 setup.py                                           | 2 +-
 src/{mpy_cross_v6_1 => mpy_cross_v6_2}/__init__.py | 0
 src/{mpy_cross_v6_1 => mpy_cross_v6_2}/__main__.py | 0
 tests/test_mpy_cross.py                            | 4 ++--
 10 files changed, 19 insertions(+), 15 deletions(-)
 rename src/{mpy_cross_v6_1 => mpy_cross_v6_2}/__init__.py (100%)
 rename src/{mpy_cross_v6_1 => mpy_cross_v6_2}/__main__.py (100%)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 56fb051..a6df05a 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -3,12 +3,12 @@ name: Build and upload to PyPI
 on:
   push:
     branches:
-      - mpy-cross-v6.1
+      - mpy-cross-v6.2
     tags:
-      - mpy-cross-v6.1/*
+      - mpy-cross-v6.2/*
   pull_request:
     branches:
-      - mpy-cross-v6.1
+      - mpy-cross-v6.2
 
 jobs:
   build_wheels:
@@ -71,4 +71,4 @@ jobs:
       - uses: pypa/gh-action-pypi-publish@v1.8.14
         with:
           user: __token__
-          password: ${{ secrets.PYPI_TOKEN3 }}
+          password: ${{ secrets.PYPI_TOKEN4 }}
diff --git a/.gitmodules b/.gitmodules
index ae301ff..4545f31 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "micropython"]
 	path = micropython
 	url = https://github.com/pybricks/micropython.git
-	branch = python-mpy-cross-v6.1
+	branch = python-mpy-cross-v6.2
diff --git a/MANIFEST.in b/MANIFEST.in
index 8782867..68aa2a6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,5 +2,5 @@ recursive-include micropython py/** mpy-cross/** shared/** tools/**
 include micropython/docs/conf.py
 prune micropython/mpy-cross/build*
 prune micropython/ports*
-exclude src/mpy_cross_v6.1/mpy-cross*
-prune src/mpy_cross_v6.1.egg-info
+exclude src/mpy_cross_v6.2/mpy-cross*
+prune src/mpy_cross_v6.2.egg-info
diff --git a/README.md b/README.md
index 3fff0a0..9c1a440 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,10 @@ For MicroPython 1.19:
 
     pip install mpy-cross-v6
 
-For MicroPython 1.20+:
+For MicroPython 1.20 to 1.21:
 
     pip install mpy-cross-v6.1
+
+For MicroPython 1.22:
+
+    pip install mpy-cross-v6.2
diff --git a/micropython b/micropython
index ed1d3bf..8cd1582 160000
--- a/micropython
+++ b/micropython
@@ -1 +1 @@
-Subproject commit ed1d3bf5075833e5156becc0f3292d172100adc1
+Subproject commit 8cd15829e293f01dae91b6a2d4a995bfaeca887b
diff --git a/pyproject.toml b/pyproject.toml
index 42334d1..d5361ec 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,13 +3,13 @@ requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "mpy-cross-v6.1"
-version = "1.0.1"
+name = "mpy-cross-v6.2"
+version = "1.0.0"
 description = "Python wrapper for the mpy-cross tool from MicroPython."
 readme = "README.md"
 
 [project.scripts]
-"mpy-cross-v6.1" = "mpy_cross_v6_1:_run"
+"mpy-cross-v6.2" = "mpy_cross_v6_2:_run"
 
 [tool.setuptools.packages.find]
 where = ["src"]
diff --git a/setup.py b/setup.py
index 8259ae5..2acb4dd 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ def run(self):
 
         subprocess.check_call(make_command)
 
-        shutil.copy(str(mpy_cross_exe), self.build_lib + "/mpy_cross_v6_1")
+        shutil.copy(str(mpy_cross_exe), self.build_lib + "/mpy_cross_v6_2")
 
 
 class custom_install(install):
diff --git a/src/mpy_cross_v6_1/__init__.py b/src/mpy_cross_v6_2/__init__.py
similarity index 100%
rename from src/mpy_cross_v6_1/__init__.py
rename to src/mpy_cross_v6_2/__init__.py
diff --git a/src/mpy_cross_v6_1/__main__.py b/src/mpy_cross_v6_2/__main__.py
similarity index 100%
rename from src/mpy_cross_v6_1/__main__.py
rename to src/mpy_cross_v6_2/__main__.py
diff --git a/tests/test_mpy_cross.py b/tests/test_mpy_cross.py
index 9c454c7..5edd198 100644
--- a/tests/test_mpy_cross.py
+++ b/tests/test_mpy_cross.py
@@ -1,6 +1,6 @@
 import struct
 
-from mpy_cross_v6_1 import mpy_cross_compile, mpy_cross_version
+from mpy_cross_v6_2 import mpy_cross_compile, mpy_cross_version
 
 
 def test_compile_no_opts():
@@ -38,4 +38,4 @@ def test_compile_with_syntax_error():
 def test_version():
     ver = mpy_cross_version()
 
-    assert "mpy-cross emitting mpy v6" in ver
+    assert "mpy-cross emitting mpy v6.2" in ver