diff --git a/package/python-decorator/Config.in b/package/python-decorator/Config.in index e7ec00cd69..0e84840657 100644 --- a/package/python-decorator/Config.in +++ b/package/python-decorator/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_DECORATOR bool "python-decorator" + depends on BR2_PACKAGE_PYTHON3 help Better living through Python with decorators diff --git a/package/python-decorator/python-decorator.hash b/package/python-decorator/python-decorator.hash index 77b48d84cd..46ff7206d7 100644 --- a/package/python-decorator/python-decorator.hash +++ b/package/python-decorator/python-decorator.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/decorator/json -md5 933981f288c4230816b5beee8d40e6ea decorator-4.4.1.tar.gz -sha256 54c38050039232e1db4ad7375cfce6748d7b41c29e95a081c8a6d2c30364a2ce decorator-4.4.1.tar.gz +md5 d01585c3ea5b36a209747fcc978a98c8 decorator-5.1.0.tar.gz +sha256 e59913af105b9860aa2c8d3272d9de5a56a4e608db9a2f167a8480b323d529a7 decorator-5.1.0.tar.gz # Locally computed sha256 checksums -sha256 fd11660cabf0532082c45706862fafc294907ec7f8e217818240a4999806782e LICENSE.txt +sha256 fd11660cabf0532082c45706862fafc294907ec7f8e217818240a4999806782e LICENSE.txt diff --git a/package/python-decorator/python-decorator.mk b/package/python-decorator/python-decorator.mk index 7c4b353aaa..a61f045e2a 100644 --- a/package/python-decorator/python-decorator.mk +++ b/package/python-decorator/python-decorator.mk @@ -4,10 +4,9 @@ # ################################################################################ -# Please keep in sync with package/python3-decorator/python3-decorator.mk -PYTHON_DECORATOR_VERSION = 4.4.1 -PYTHON_DECORATOR_SITE = https://files.pythonhosted.org/packages/dc/c3/9d378af09f5737cfd524b844cd2fbb0d2263a35c11d712043daab290144d +PYTHON_DECORATOR_VERSION = 5.1.0 PYTHON_DECORATOR_SOURCE = decorator-$(PYTHON_DECORATOR_VERSION).tar.gz +PYTHON_DECORATOR_SITE = https://files.pythonhosted.org/packages/92/3c/34f8448b61809968052882b830f7d8d9a8e1c07048f70deb039ae599f73c PYTHON_DECORATOR_LICENSE = BSD-2-Clause PYTHON_DECORATOR_LICENSE_FILES = LICENSE.txt PYTHON_DECORATOR_CPE_ID_VENDOR = python @@ -15,3 +14,4 @@ PYTHON_DECORATOR_CPE_ID_PRODUCT = decorator PYTHON_DECORATOR_SETUP_TYPE = setuptools $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk index e84bddf86f..3b05011eb9 100644 --- a/package/python-networkx/python-networkx.mk +++ b/package/python-networkx/python-networkx.mk @@ -12,7 +12,7 @@ PYTHON_NETWORKX_LICENSE_FILES = LICENSE.txt PYTHON_NETWORKX_CPE_ID_VENDOR = python PYTHON_NETWORKX_CPE_ID_PRODUCT = networkx PYTHON_NETWORKX_SETUP_TYPE = setuptools -HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python3-decorator +HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python-decorator HOST_PYTHON_NETWORKX_NEEDS_HOST_PYTHON = python3 $(eval $(python-package)) diff --git a/package/python3-decorator/python3-decorator.hash b/package/python3-decorator/python3-decorator.hash deleted file mode 120000 index f515d3133b..0000000000 --- a/package/python3-decorator/python3-decorator.hash +++ /dev/null @@ -1 +0,0 @@ -../python-decorator/python-decorator.hash \ No newline at end of file diff --git a/package/python3-decorator/python3-decorator.mk b/package/python3-decorator/python3-decorator.mk deleted file mode 100644 index ed6d86fe3a..0000000000 --- a/package/python3-decorator/python3-decorator.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# python3-decorator -# -################################################################################ - -# Please keep in sync with package/python-decorator/python-decorator.mk -PYTHON3_DECORATOR_VERSION = 4.4.1 -PYTHON3_DECORATOR_SITE = https://files.pythonhosted.org/packages/dc/c3/9d378af09f5737cfd524b844cd2fbb0d2263a35c11d712043daab290144d -PYTHON3_DECORATOR_SOURCE = decorator-$(PYTHON3_DECORATOR_VERSION).tar.gz -PYTHON3_DECORATOR_LICENSE = BSD-2-Clause -PYTHON3_DECORATOR_LICENSE_FILES = LICENSE.txt -PYTHON3_DECORATOR_CPE_ID_VENDOR = python -PYTHON3_DECORATOR_CPE_ID_PRODUCT = decorator -PYTHON3_DECORATOR_SETUP_TYPE = setuptools -HOST_PYTHON3_DECORATOR_NEEDS_HOST_PYTHON = python3 - -$(eval $(host-python-package))