Merge Official Source

Signed-off-by: Tianling Shen <[email protected]>

lang/python/micropython/patches/050-py-stackctrl-fix-gcc-13.patch

@@ -0,0 +1,31 @@
+From f1c6cb7725960487195daa5c5c196fd8d3563811 Mon Sep 17 00:00:00 2001
+From: Damien George <[email protected]>
+Date: Wed, 3 May 2023 15:23:24 +1000
+Subject: [PATCH] py/stackctrl: Add gcc pragmas to ignore dangling-pointer
+ warning.
+
+This warning became apparent in gcc 13.
+
+Signed-off-by: Damien George <[email protected]>
+---
+ py/stackctrl.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/py/stackctrl.c
++++ b/py/stackctrl.c
+@@ -28,8 +28,15 @@
+ #include "py/stackctrl.h"
+
+ void mp_stack_ctrl_init(void) {
++    #if __GNUC__ >= 13
++    #pragma GCC diagnostic push
++    #pragma GCC diagnostic ignored "-Wdangling-pointer"
++    #endif
+     volatile int stack_dummy;
+     MP_STATE_THREAD(stack_top) = (char *)&stack_dummy;
++    #if __GNUC__ >= 13
++    #pragma GCC diagnostic pop
++    #endif
+ }
+
+ void mp_stack_set_top(void *top) {

lang/python/python-cachelib/Makefile

@@ -5,15 +5,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-cachelib
-PKG_VERSION:=0.3.0
+PKG_VERSION:=0.10.2
 PKG_RELEASE:=1
 
 PYPI_NAME:=cachelib
-PKG_HASH:=cc1856259f102c9273efa342100f70d9fafbd07b41ce05c501ee28e1dbbb5133
+PKG_HASH:=593faeee62a7c037d50fc835617a01b887503f972fb52b188ae7e50e9cb69740
 
 PKG_MAINTAINER:=Stepan Henek <[email protected]>
 PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
+PKG_LICENSE_FILES:=LICENSE.rst
 
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
@@ -23,9 +23,9 @@ define Package/python3-cachelib
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
-  TITLE:=cachelib
-  URL:=https://github.com/pallets/cachelib
-  DEPENDS:=+python3-light
+  TITLE:=Collection of cache libraries
+  URL:=https://github.com/pallets-eco/cachelib/
+  DEPENDS:=+python3-light +python3-logging
 endef
 
 define Package/python3-cachelib/description

lang/python/python-cachetools/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-cachetools
-PKG_VERSION:=3.1.1
-PKG_RELEASE:=2
+PKG_VERSION:=5.3.1
+PKG_RELEASE:=1
 
 PYPI_NAME:=cachetools
-PKG_HASH:=8ea2d3ce97850f31e4a08b0e2b5e6c34997d7216a9d2c98e0f3978630d4da69a
+PKG_HASH:=dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b
 
 PKG_MAINTAINER:=Josef Schlehofer <[email protected]>
 PKG_LICENSE:=MIT
@@ -32,7 +32,9 @@ define Package/python3-cachetools
 endef
 
 define Package/python3-cachetools/description
-  This module provides various memoizing collections and decorators, including variants of the Python 3 Standard Library lru_cache function decorator.
+This module provides various memoizing collections and decorators,
+including variants of the Python 3 Standard Library's @lru_cache
+function decorator.
 endef
 
 $(eval $(call Py3Package,python3-cachetools))

lang/python/python-ciso8601/Makefile

@@ -8,15 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-ciso8601
-PKG_VERSION:=2.1.3
+PKG_VERSION:=2.3.0
 PKG_RELEASE:=1
 
 PYPI_NAME:=ciso8601
-PKG_HASH:=bdbb5b366058b1c87735603b23060962c439ac9be66f1ae91e8c7dbd7d59e262
+PKG_HASH:=19e3fbd786d8bec3358eac94d8774d365b694b604fd1789244b87083f66c8900
 
 PKG_MAINTAINER:=Josef Schlehofer <[email protected]>
 PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE.txt
+PKG_LICENSE_FILES:=LICENSE
 
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
@@ -26,13 +26,14 @@ define Package/python3-ciso8601
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
-  TITLE:=Fast ISO8601 date time parser for Python written in C
+  TITLE:=Fast ISO8601 date time parser written in C
   URL:=https://github.com/closeio/ciso8601
   DEPENDS:=+python3-light
 endef
 
 define Package/python3-ciso8601/description
-  ciso8601 converts ISO 8601 or RFC 3339 date time strings into Python datetime objects.
+ciso8601 converts ISO 8601 or RFC 3339 date time strings into Python
+datetime objects.
 endef
 
 $(eval $(call Py3Package,python3-ciso8601))

lang/python/python-click/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-click
-PKG_VERSION:=8.1.4
+PKG_VERSION:=8.1.6
 PKG_RELEASE:=1
 
 PYPI_NAME:=click
-PKG_HASH:=b97d0c74955da062a7d4ef92fadb583806a585b2ea81958a81bd72726cbb8e37
+PKG_HASH:=48ee849951919527a045bfe3bf7baa8a959c423134e1a5b98c05c20ba75a1cbd
 
 PKG_MAINTAINER:=Jeffery To <[email protected]>
 PKG_LICENSE:=BSD-3-Clause

lang/python/python-colorama/Makefile

@@ -1,14 +1,17 @@
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=colorama
-PKG_VERSION:=0.4.1
-PKG_RELEASE:=2
+PKG_NAME:=python-colorama
+PKG_VERSION:=0.4.6
+PKG_RELEASE:=1
 
-PYPI_NAME:=$(PKG_NAME)
-PKG_HASH:=05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d
+PYPI_NAME:=colorama
+PKG_HASH:=08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44
 
 PKG_MAINTAINER:=Daniel Danzberger <[email protected]>
-PKG_LICENSE:=MIT
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE.txt
+
+PKG_BUILD_DEPENDS:=python-hatchling/host
 
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
@@ -18,14 +21,14 @@ define Package/python3-colorama
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
-  TITLE:=colorama
+  TITLE:=Cross-platform colored terminal text
   URL:=https://github.com/tartley/colorama
-  DEPENDS:=+python3
+  DEPENDS:=+python3-light
 endef
 
 define Package/python3-colorama/description
-Makes ANSI escape character sequences
-(for producing colored terminal text and cursor positioning) work under MS Windows.
+Makes ANSI escape character sequences (for producing colored terminal
+text and cursor positioning) work under MS Windows.
 endef
 
 $(eval $(call Py3Package,python3-colorama))

lang/python/python-contextlib2/Makefile

@@ -5,12 +5,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-contextlib2
-PKG_VERSION:=0.6.0.post1
+PKG_VERSION:=21.6.0
 PKG_RELEASE:=1
-PKG_MAINTAINER:=Karel Kočí <[email protected]>
 
 PYPI_NAME:=contextlib2
-PKG_HASH:=01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e
+PKG_HASH:=ab1e2bfe1d01d968e1b7e8d9023bc51ef3509bba217bb730cee3827e1ee82869
+
+PKG_MAINTAINER:=Karel Kočí <[email protected]>
+PKG_LICENSE:=PSF-2.0 Apache-2.0
+PKG_LICENSE_FILES:=LICENSE.txt
 
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
@@ -20,13 +23,14 @@ define Package/python3-contextlib2
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
-  URL:=http://contextlib2.readthedocs.org
-  TITLE:=python3-contextlib2
+  URL:=https://contextlib2.readthedocs.org
+  TITLE:=Backports and enhancements for the contextlib module
   DEPENDS:=+python3-light
 endef
 
 define Package/python-contextlib2/description
-  contextlib2 is a backport of the standard library’s contextlib module to earlier Python versions.
+contextlib2 is a backport of the standard library's contextlib module to
+earlier Python versions.
 endef
 
 $(eval $(call Py3Package,python3-contextlib2))

lang/python/python-dns/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-dns
-PKG_VERSION:=2.3.0
+PKG_VERSION:=2.4.1
 PKG_RELEASE:=1
 
 PYPI_NAME:=dnspython
-PKG_HASH:=224e32b03eb46be70e12ef6d64e0be123a64e621ab4c0822ff6d450d52a540b9
+PKG_HASH:=c33971c79af5be968bb897e95c2448e11a645ee84d93b265ce0b7aabe5dfdca8
 
 PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=LICENSE
@@ -28,13 +28,15 @@ define Package/python3-dns
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
-  TITLE:=dnspython
-  URL:=http://www.dnspython.org/
+  TITLE:=DNS toolkit
+  URL:=https://www.dnspython.org/
   DEPENDS:=+python3
 endef
 
 define Package/python3-dns/description
- dnspython is a DNS toolkit for Python. It supports almost all record types. It can be used for queries, zone transfers, and dynamic updates. It supports TSIG authenticated messages and EDNS0.
+dnspython is a DNS toolkit for Python. It supports almost all record
+types. It can be used for queries, zone transfers, and dynamic updates.
+It supports TSIG authenticated messages and EDNS0.
 endef
 
 $(eval $(call Py3Package,python3-dns))

lang/python/python-docutils/Makefile

@@ -1,14 +1,15 @@
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=docutils
-PKG_VERSION:=0.19
-PKG_RELEASE:=2
+PKG_NAME:=python-docutils
+PKG_VERSION:=0.20.1
+PKG_RELEASE:=1
 
-PYPI_NAME:=$(PKG_NAME)
-PKG_HASH:=33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6
+PYPI_NAME:=docutils
+PKG_HASH:=f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b
 
 PKG_MAINTAINER:=Daniel Danzberger <[email protected]>
-PKG_LICENSE:=MIT
+PKG_LICENSE:=Public-Domain BSD-2-License Python-2.0.1 GPL-3.0-or-later
+PKG_LICENSE_FILES:=COPYING.txt licenses/BSD-2-Clause.txt licenses/python-2-1-1.txt licenses/gpl-3-0.txt
 
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
@@ -18,15 +19,16 @@ define Package/python3-docutils
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
-  TITLE:=docutils
-  URL:=http://docutils.sourceforge.net
+  TITLE:=Documentation Utilities
+  URL:=https://docutils.sourceforge.io/
   DEPENDS:=+python3
 endef
 
 define Package/python3-docutils/description
-Docutils is a modular system for processing documentation into useful formats,
-such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText,
-an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax.
+Docutils is a modular system for processing documentation into useful
+formats, such as HTML, XML, and LaTeX. For input Docutils supports
+reStructuredText, an easy-to-read, what-you-see-is-what-you-get
+plaintext markup syntax.
 endef
 
 $(eval $(call Py3Package,python3-docutils))

lang/python/python-editables/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-editables
-PKG_VERSION:=0.4
+PKG_VERSION:=0.5
 PKG_RELEASE:=1
 
 PYPI_NAME:=editables
-PKG_HASH:=dc322c42e7ccaf19600874035a4573898d88aadd07e177c239298135b75da772
+PKG_HASH:=309627d9b5c4adc0e668d8c6fa7bac1ba7c8c5d415c2d27f60f081f8e80d1de2
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE.txt

lang/python/python-engineio/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-engineio
-PKG_VERSION:=4.1.0
+PKG_VERSION:=4.5.1
 PKG_RELEASE:=1
 
 PYPI_NAME:=python-engineio
-PKG_HASH:=21e1bcc62f5573a4bb1c805e69915c5a4c5aa953005dde6c2f707c24554c1020
+PKG_HASH:=b167a1b208fcdce5dbe96a61a6ca22391cfa6715d796c22de93e3adf9c07ae0c
 
 PKG_MAINTAINER:=Jan Pavlinec <[email protected]>
 PKG_LICENSE:=MIT
@@ -26,7 +26,7 @@ define Package/python3-engineio
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
-  TITLE:=Engine.IO server
+  TITLE:=Engine.IO server and client
   URL:=https://github.com/miguelgrinberg/python-engineio
   DEPENDS:= \
 	+python3-light \

lang/python/python-flask-babel/Makefile

@@ -8,16 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-flask-babel
-PKG_VERSION:=2.0.0
+PKG_VERSION:=3.1.0
 PKG_RELEASE:=1
 
-PYPI_NAME:=Flask-Babel
-PKG_HASH:=f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d
+PYPI_NAME:=flask-babel
+PYPI_SOURCE_NAME:=flask_babel
+PKG_HASH:=be015772c5d7f046f3b99c508dcf618636eb93d21b713b356db79f3e79f69f39
 
 PKG_MAINTAINER:=Josef Schlehofer <[email protected]>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_BUILD_DEPENDS:=python-poetry-core/host
+
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
@@ -26,7 +29,7 @@ define Package/python3-flask-babel
   SECTION:=lang
   CATEGORY:=Languages
   SUBMENU:=Python
-  TITLE:=Flask Babel
+  TITLE:=i18n/l10n support for Flask applications
   URL:=https://github.com/python-babel/flask-babel
   DEPENDS:= \
     +python3-light \

lang/python/python-flask-httpauth/Makefile

@@ -7,12 +7,12 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=python3-flask-httpauth
-PKG_VERSION:=4.2.0
+PKG_NAME:=python-flask-httpauth
+PKG_VERSION:=4.8.0
 PKG_RELEASE:=1
 
 PYPI_NAME:=Flask-HTTPAuth
-PKG_HASH:=8c7e49e53ce7dc14e66fe39b9334e4b7ceb8d0b99a6ba1c3562bb528ef9da84a
+PKG_HASH:=66568a05bc73942c65f1e2201ae746295816dc009edd84b482c44c758d75097a
 
 PKG_MAINTAINER:=Jan Pavlinec <[email protected]>
 PKG_LICENSE:=MIT
@@ -26,7 +26,7 @@ define Package/python3-flask-httpauth
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
-  TITLE:=Basic and Digest HTTP authentication for Flask routes
+  TITLE:=HTTP authentication for Flask routes
   URL:=https://github.com/miguelgrinberg/flask-httpauth
   DEPENDS:= \
 	+python3-light \