python-automat: Update to 22.10.0, refresh patches

This also removes the patch to avoid setuptools-scm and adds a build
dependency on python-setuptools-scm/host.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>

diff --git a/lang/python/python-automat/Makefile b/lang/python/python-automat/Makefile
index 7802168aae651b32e3e4e018e17556da5e474d20..83fc3ced67bc1a1717647379762ca795d379d584 100644 (file)
--- a/lang/python/python-automat/Makefile
+++ b/lang/python/python-automat/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 OpenWrt.org
+# Copyright (C) 2018-2020, 2023 Jeffery To
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,23 +8,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-automat
-PKG_VERSION:=20.2.0
-PKG_RELEASE:=3
+PKG_VERSION:=22.10.0
+PKG_RELEASE:=1
 
 PYPI_NAME:=Automat
-PKG_HASH:=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33
+PKG_HASH:=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
 
+PKG_BUILD_DEPENDS:=python-setuptools-scm/host
+
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
 
-PYTHON3_PKG_BUILD_VARS:= \
-  PKG_VERSION="$(PKG_VERSION)"
-
 define Package/python3-automat
   SECTION:=lang
   CATEGORY:=Languages

diff --git a/lang/python/python-automat/patches/001-do-not-use-setuptools-scm-m2r.patch b/lang/python/python-automat/patches/001-do-not-use-setuptools-scm-m2r.patch
deleted file mode 100644 (file)
index e749af3..0000000
--- a/lang/python/python-automat/patches/001-do-not-use-setuptools-scm-m2r.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -2,6 +2,7 @@
- Setup file for automat
- """
- 
-+import os
- from setuptools import setup, find_packages
- 
- try:
-@@ -14,7 +15,7 @@ except(IOError, ImportError):
- 
- setup(
-     name='Automat',
--    use_scm_version=True,
-+    version=os.getenv('PKG_VERSION'),
-     url='https://github.com/glyph/Automat',
-     description="""
-     Self-service finite-state machines for the programmer on the go.
-@@ -22,10 +23,6 @@ setup(
-     long_description=long_description,
-     packages=find_packages(exclude=[]),
-     package_dir={'automat': 'automat'},
--    setup_requires=[
--        'setuptools-scm',
--        'm2r',
--    ],
-     install_requires=[
-         "attrs>=19.2.0",
-         "six",

diff --git a/lang/python/python-automat/patches/002-omit-visualize.patch b/lang/python/python-automat/patches/002-omit-visualize.patch
index ede27969634cdf24d6dec99173e2aaa6e2c63568..977f96130087affed30cc4c2a7465532970e50f1 100644 (file)
--- a/lang/python/python-automat/patches/002-omit-visualize.patch
+++ b/lang/python/python-automat/patches/002-omit-visualize.patch
@@ -1,6 +1,6 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -27,15 +27,6 @@ setup(
+@@ -22,15 +22,6 @@ setup(
          "attrs>=19.2.0",
          "six",
      ],

diff --git a/lang/python/python-automat/patches/003-omit-tests.patch b/lang/python/python-automat/patches/003-omit-tests.patch
index 81f9e8b363094eb562be366d5574441658c3472a..58eccf00753a5826972f7176136c0d5e8ebd2e88 100644 (file)
--- a/lang/python/python-automat/patches/003-omit-tests.patch
+++ b/lang/python/python-automat/patches/003-omit-tests.patch
@@ -1,15 +1,15 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -21,7 +21,7 @@ setup(
+@@ -12,7 +12,7 @@ setup(
      Self-service finite-state machines for the programmer on the go.
      """.strip(),
-     long_description=long_description,
+     readme='README.md',
 -    packages=find_packages(exclude=[]),
 +    packages=find_packages(exclude=["*._test", "*._test.*"]),
      package_dir={'automat': 'automat'},
-     install_requires=[
-         "attrs>=19.2.0",
-@@ -30,6 +30,7 @@ setup(
+     setup_requires=[
+         'wheel',
+@@ -25,6 +25,7 @@ setup(
      author='Glyph',
      author_email='glyph@twistedmatrix.com',
      include_package_data=True,