From 0509d460c844c2f62d09fd99c35a0e1627c66b68 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Fri, 26 May 2023 02:06:57 +0800 Subject: [PATCH] python-tomli: Remove package Python added tomli to its standard library in 3.11. Now that Python in the packages feed has been updated to 3.11, the separate tomli package is no longer necessary. This removes python-tomli and updates all dependant packages, removing python-tomli from their lists of dependencies. Signed-off-by: Jeffery To --- lang/python/python-build/Makefile | 5 +- lang/python/python-flit-scm/Makefile | 7 ++- .../python-hatch-fancy-pypi-readme/Makefile | 11 ++-- lang/python/python-hatchling/Makefile | 4 +- lang/python/python-pyproject-hooks/Makefile | 4 +- lang/python/python-pytest/Makefile | 3 +- lang/python/python-setuptools-scm/Makefile | 4 +- lang/python/python-tomli/Makefile | 50 ------------------- 8 files changed, 13 insertions(+), 75 deletions(-) delete mode 100644 lang/python/python-tomli/Makefile diff --git a/lang/python/python-build/Makefile b/lang/python/python-build/Makefile index e60023725e..e93025a631 100644 --- a/lang/python/python-build/Makefile +++ b/lang/python/python-build/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-build PKG_VERSION:=0.10.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=build PKG_HASH:=d5b71264afdb5951d6704482aac78de887c80691c52b88a9ad195983ca2c9269 @@ -24,8 +24,7 @@ HOST_BUILD_DEPENDS:= \ python-installer/host \ python-flit-core/host \ python-packaging/host \ - python-pyproject-hooks/host \ - python-tomli/host + python-pyproject-hooks/host PYTHON3_HOST_BUILD_VARS:=PYTHONPATH=src diff --git a/lang/python/python-flit-scm/Makefile b/lang/python/python-flit-scm/Makefile index 57660f79bb..87188fd743 100644 --- a/lang/python/python-flit-scm/Makefile +++ b/lang/python/python-flit-scm/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-flit-scm PKG_VERSION:=1.7.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=flit-scm PYPI_SOURCE_NAME:=flit_scm @@ -25,8 +25,7 @@ HOST_BUILD_DEPENDS:= \ python-build/host \ python-installer/host \ python-flit-core/host \ - python-setuptools-scm/host \ - python-tomli/host + python-setuptools-scm/host include ../pypi.mk include $(INCLUDE_DIR)/package.mk @@ -40,7 +39,7 @@ define Package/python3-flit-scm SUBMENU:=Python TITLE:=A PEP 518 build backend that uses setuptools_scm and flit URL:=https://gitlab.com/WillDaSilva/flit_scm - DEPENDS:=+python3-light +python3-flit-core +python3-setuptools-scm +python3-tomli + DEPENDS:=+python3-light +python3-flit-core +python3-setuptools-scm BUILDONLY:=1 endef diff --git a/lang/python/python-hatch-fancy-pypi-readme/Makefile b/lang/python/python-hatch-fancy-pypi-readme/Makefile index 4a2ab871d3..24e27be36c 100644 --- a/lang/python/python-hatch-fancy-pypi-readme/Makefile +++ b/lang/python/python-hatch-fancy-pypi-readme/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-hatch-fancy-pypi-readme PKG_VERSION:=22.8.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=hatch-fancy-pypi-readme PYPI_SOURCE_NAME:=hatch_fancy_pypi_readme @@ -20,12 +20,7 @@ PKG_LICENSE_FILES:=LICENSE.txt PKG_MAINTAINER:=Jeffery To PKG_HOST_ONLY:=1 -HOST_BUILD_DEPENDS:= \ - python3/host \ - python-build/host \ - python-installer/host \ - python-hatchling/host \ - python-tomli/host +HOST_BUILD_DEPENDS:=python3/host python-build/host python-installer/host python-hatchling/host include ../pypi.mk include $(INCLUDE_DIR)/package.mk @@ -39,7 +34,7 @@ define Package/python3-hatch-fancy-pypi-readme SUBMENU:=Python TITLE:=Fancy PyPI READMEs with Hatch URL:=https://github.com/hynek/hatch-fancy-pypi-readme - DEPENDS:=+python3-light +python3-hatchling +python3-tomli + DEPENDS:=+python3-light +python3-hatchling BUILDONLY:=1 endef diff --git a/lang/python/python-hatchling/Makefile b/lang/python/python-hatchling/Makefile index 76ca4fc1a1..6bc1b8fbcb 100644 --- a/lang/python/python-hatchling/Makefile +++ b/lang/python/python-hatchling/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-hatchling PKG_VERSION:=1.17.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=hatchling PKG_HASH:=b1244db3f45b4ef5a00106a46612da107cdfaf85f1580b8e1c059fefc98b0930 @@ -27,7 +27,6 @@ HOST_BUILD_DEPENDS:= \ python-packaging/host \ python-pathspec/host \ python-pluggy/host \ - python-tomli/host \ python-trove-classifiers/host include ../pypi.mk @@ -49,7 +48,6 @@ define Package/python3-hatchling +python3-packaging \ +python3-pathspec \ +python3-pluggy \ - +python3-tomli \ +python3-trove-classifiers BUILDONLY:=1 endef diff --git a/lang/python/python-pyproject-hooks/Makefile b/lang/python/python-pyproject-hooks/Makefile index 50b3780ede..316a8026db 100644 --- a/lang/python/python-pyproject-hooks/Makefile +++ b/lang/python/python-pyproject-hooks/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-pyproject-hooks PKG_VERSION:=1.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=pyproject_hooks PKG_HASH:=f271b298b97f5955d53fb12b72c1fb1948c22c1a6b70b315c54cedaca0264ef5 @@ -19,7 +19,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Jeffery To PKG_HOST_ONLY:=1 -HOST_BUILD_DEPENDS:=python3/host python-flit-core/host python-installer/host python-tomli/host +HOST_BUILD_DEPENDS:=python3/host python-flit-core/host python-installer/host include ../pypi.mk include $(INCLUDE_DIR)/package.mk diff --git a/lang/python/python-pytest/Makefile b/lang/python/python-pytest/Makefile index dd978d248f..473192c312 100644 --- a/lang/python/python-pytest/Makefile +++ b/lang/python/python-pytest/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-pytest PKG_VERSION:=7.3.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=pytest PKG_HASH:=58ecc27ebf0ea643ebfdf7fb1249335da761a00c9f955bcd922349bcb68ee57d @@ -34,7 +34,6 @@ define Package/python3-pytest +python3 \ +python3-pluggy \ +python3-packaging \ - +python3-tomli \ +python3-exceptiongroup \ +python3-iniconfig endef diff --git a/lang/python/python-setuptools-scm/Makefile b/lang/python/python-setuptools-scm/Makefile index c9a0ec78d9..5e197a57f9 100644 --- a/lang/python/python-setuptools-scm/Makefile +++ b/lang/python/python-setuptools-scm/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-setuptools-scm PKG_VERSION:=7.1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=setuptools-scm PYPI_SOURCE_NAME:=setuptools_scm @@ -26,7 +26,6 @@ HOST_BUILD_DEPENDS:= \ python-installer/host \ python-wheel/host \ python-packaging/host \ - python-tomli/host \ python-typing-extensions/host include ../pypi.mk @@ -46,7 +45,6 @@ define Package/python3-setuptools-scm +python3-logging \ +python3-packaging \ +python3-setuptools \ - +python3-tomli \ +python3-typing-extensions BUILDONLY:=1 endef diff --git a/lang/python/python-tomli/Makefile b/lang/python/python-tomli/Makefile deleted file mode 100644 index db615e39ba..0000000000 --- a/lang/python/python-tomli/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# -# Copyright (C) 2023 Jeffery To -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=python-tomli -PKG_VERSION:=2.0.1 -PKG_RELEASE:=1 - -PYPI_NAME:=tomli -PKG_HASH:=de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f - -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Jeffery To - -PKG_HOST_ONLY:=1 -HOST_BUILD_DEPENDS:=python3/host python-flit-core/host python-installer/host - -include ../pypi.mk -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/host-build.mk -include ../python3-package.mk -include ../python3-host-build.mk - -define Package/python3-tomli - SECTION:=lang - CATEGORY:=Languages - SUBMENU:=Python - TITLE:=A lil' TOML parser - URL:=https://github.com/hukkin/tomli - DEPENDS:=+python3-light - BUILDONLY:=1 -endef - -define Package/python3-tomli/description -Tomli is a Python library for parsing TOML. Tomli is fully compatible -with TOML v1.0.0. -endef - -Host/Compile=$(Py3Host/Compile/Bootstrap) - -$(eval $(call Py3Package,python3-tomli)) -$(eval $(call BuildPackage,python3-tomli)) -$(eval $(call BuildPackage,python3-tomli-src)) -$(eval $(call HostBuild))