From 7312e25b458908e180deb3352dc7d08c68dac107 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 | 6 +++---
 .gitmodules                   | 2 +-
 MANIFEST.in                   | 4 ++--
 README.md                     | 6 +++++-
 micropython                   | 2 +-
 pyproject.toml                | 6 +++---
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 56fb051..dd49ebb 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:
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"]