From 3085608448e97130b59f3c82da2a582ec6794103 Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Sun, 15 Oct 2023 22:56:42 +0800
Subject: [PATCH] micropython-mpremote: Update to 1.21.0, rename package, move
 into utils

This renames the package to mpremote and moves it into utils, as this is
a command-line utility and not a Python/MicroPython library.

This also adds a test.sh script for the packages feed CI.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
---
 .../mpremote}/Makefile                        | 25 +++++++++----------
 .../patches/001-no-importlib_metadata.patch   |  0
 utils/mpremote/test.sh                        |  5 ++++
 3 files changed, 17 insertions(+), 13 deletions(-)
 rename {lang/python/micropython-mpremote => utils/mpremote}/Makefile (62%)
 rename {lang/python/micropython-mpremote => utils/mpremote}/patches/001-no-importlib_metadata.patch (100%)
 create mode 100644 utils/mpremote/test.sh

diff --git a/lang/python/micropython-mpremote/Makefile b/utils/mpremote/Makefile
similarity index 62%
rename from lang/python/micropython-mpremote/Makefile
rename to utils/mpremote/Makefile
index 9beca01563..af69d8088a 100644
--- a/lang/python/micropython-mpremote/Makefile
+++ b/utils/mpremote/Makefile
@@ -7,12 +7,12 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=micropython-mpremote
-PKG_VERSION:=1.20.0
+PKG_NAME:=mpremote
+PKG_VERSION:=1.21.0
 PKG_RELEASE:=1
 
 PYPI_NAME:=mpremote
-PKG_HASH:=5c342762a04791309dd49bce63c70a075aa7c548b1c0076262b96f9ccc398ca2
+PKG_HASH:=65bc94511f6ff499e901ab59462a5f0744ff7e2cf71d8c75700d14a89c54ed61
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
@@ -20,25 +20,24 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
 
 PKG_BUILD_DEPENDS:=python-hatchling/host python-hatch-requirements-txt/host python-hatch-vcs/host
 
-include ../pypi.mk
+include ../../lang/python/pypi.mk
 include $(INCLUDE_DIR)/package.mk
-include ../python3-package.mk
+include ../../lang/python/python3-package.mk
 
-define Package/micropython-mpremote
-  SECTION:=lang
-  CATEGORY:=Languages
-  SUBMENU:=Python
+define Package/mpremote
+  SECTION:=utils
+  CATEGORY:=Utilities
   TITLE:=Interacting remotely with MicroPython devices
   URL:=https://github.com/micropython/micropython
   DEPENDS:=+python3-light +python3-urllib +python3-pyserial
 endef
 
-define Package/micropython-mpremote/description
+define Package/mpremote/description
 This CLI tool provides an integrated set of utilities to remotely
 interact with and automate a MicroPython device over a serial
 connection.
 endef
 
-$(eval $(call Py3Package,micropython-mpremote))
-$(eval $(call BuildPackage,micropython-mpremote))
-$(eval $(call BuildPackage,micropython-mpremote-src))
+$(eval $(call Py3Package,mpremote))
+$(eval $(call BuildPackage,mpremote))
+$(eval $(call BuildPackage,mpremote-src))
diff --git a/lang/python/micropython-mpremote/patches/001-no-importlib_metadata.patch b/utils/mpremote/patches/001-no-importlib_metadata.patch
similarity index 100%
rename from lang/python/micropython-mpremote/patches/001-no-importlib_metadata.patch
rename to utils/mpremote/patches/001-no-importlib_metadata.patch
diff --git a/utils/mpremote/test.sh b/utils/mpremote/test.sh
new file mode 100644
index 0000000000..3010c24c43
--- /dev/null
+++ b/utils/mpremote/test.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[ "$1" = mpremote ] || exit 0
+
+mpremote version | grep -Fx "mpremote $PKG_VERSION"