diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2023-05-10 12:11:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-10 12:11:07 +0800 |
| commit | 8a36b03870fd2f6b75b8890ce912660e00ccade8 (patch) | |
| tree | 5e03f31c967408fe8ce0e7e3d470f4d5eb0a3863 /lang/python/python-incremental | |
| parent | 83dd66fd34792c692a477c2ed8430f81802d8f22 (diff) | |
| parent | b1b008f42ff0a6da96b801e2eaf68be4e2f2b5bb (diff) | |
Merge pull request #20801 from jefferyto/python-pyproject
python: Add proper support for pyproject.toml-based builds, update Python packages for new build process
Diffstat (limited to 'lang/python/python-incremental')
| -rw-r--r-- | lang/python/python-incremental/Makefile | 11 | ||||
| -rw-r--r-- | lang/python/python-incremental/patches/001-omit-tests.patch | 25 |
2 files changed, 21 insertions, 15 deletions
diff --git a/lang/python/python-incremental/Makefile b/lang/python/python-incremental/Makefile index e3fa8efcb..31d88c9df 100644 --- a/lang/python/python-incremental/Makefile +++ b/lang/python/python-incremental/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2018 OpenWrt.org +# Copyright (C) 2018, 2021, 2023 Jeffery To # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-incremental -PKG_VERSION:=21.3.0 +PKG_VERSION:=22.10.0 PKG_RELEASE:=1 PYPI_NAME:=incremental -PKG_HASH:=02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57 +PKG_HASH:=912feeb5e0f7e0188e6f42241d2f450002e11bbc0937c65865045854c24c0bd0 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE @@ -20,7 +20,9 @@ PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> 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-incremental SECTION:=lang @@ -28,7 +30,7 @@ define Package/python3-incremental SUBMENU:=Python TITLE:=Versions your Python projects URL:=https://github.com/twisted/incremental - DEPENDS:=+python3-light + DEPENDS:=+python3-light +python3-distutils +python3-pkg-resources endef define Package/python3-incremental/description @@ -38,3 +40,4 @@ endef $(eval $(call Py3Package,python3-incremental)) $(eval $(call BuildPackage,python3-incremental)) $(eval $(call BuildPackage,python3-incremental-src)) +$(eval $(call HostBuild)) diff --git a/lang/python/python-incremental/patches/001-omit-tests.patch b/lang/python/python-incremental/patches/001-omit-tests.patch index 5c228c004..b71c6e35f 100644 --- a/lang/python/python-incremental/patches/001-omit-tests.patch +++ b/lang/python/python-incremental/patches/001-omit-tests.patch @@ -1,11 +1,14 @@ ---- a/setup.py -+++ b/setup.py -@@ -31,7 +31,7 @@ setup( - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", - ], -- packages=find_packages("src", exclude=("exampleproj",)), -+ packages=find_packages("src", exclude=("exampleproj", "*.tests", "*.tests.*")), - package_dir={"": "src"}, - extras_require={"scripts": ["click>=6.0", "twisted>=16.4.0"]}, - license="MIT", +--- a/setup.cfg ++++ b/setup.cfg +@@ -30,7 +30,10 @@ zip_safe = False + + [options.packages.find] + where = src +-exclude = exampleproj ++exclude = ++ exampleproj ++ *.tests ++ *.tests.* + + [options.package_data] + incremental = py.typed |