mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-23 13:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

package/python-markupsafe: bump to version 2.0.1

Browse Source 
Drop python2 support.

Remove python3-markupsafe host build as python2 host builds for
markupsafe are not supported, python3 host builds are moved to
python-markupsafe.

Remove python3-jinja2 host build as python2 host builds for
jinja2 are not supported, python3 host builds are moved to
python-jinja2.

Remove python3-mako host build as python2 host builds for
mako are not supported, python3 host builds are moved to
python-mako.

Propagate reverse python3 dependency.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
James Hilliard 2021-10-26 15:47:03 -06:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 3db4d486d6
commit e9df5b0fc3
26 changed files with 34 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gnuradio/gnuradio.mk
View File

@ -20,7 +20,7 @@ endif
# host-python-mako and host-python-six are needed for volk to compile # host-python-mako and host-python-six are needed for volk to compile
GNURADIO_DEPENDENCIES = \ GNURADIO_DEPENDENCIES = \
$(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) \ host-python3 \
host-python-mako \ host-python-mako \
host-python-six \ host-python-six \
host-swig \ host-swig \

6
package/jailhouse/Config.in
View File

@ -11,15 +11,15 @@ if BR2_PACKAGE_JAILHOUSE
config BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS config BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS
bool "helper scripts" bool "helper scripts"
depends on BR2_PACKAGE_PYTHON depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_MAKO # runtime select BR2_PACKAGE_PYTHON_MAKO # runtime
help help
Python-based helpers for the Jailhouse Hypervisor. Python-based helpers for the Jailhouse Hypervisor.
https://github.com/siemens/jailhouse https://github.com/siemens/jailhouse
comment "helper scripts require Python" comment "helper scripts require Python3"
depends on !BR2_PACKAGE_PYTHON depends on !BR2_PACKAGE_PYTHON3
endif endif

2
package/libcamera/libcamera.mk
View File

@ -10,7 +10,7 @@ LIBCAMERA_SITE_METHOD = git
LIBCAMERA_DEPENDENCIES = \ LIBCAMERA_DEPENDENCIES = \
host-openssl \ host-openssl \
host-pkgconf \ host-pkgconf \
host-python3-jinja2 \ host-python-jinja2 \
host-python3-ply \ host-python3-ply \
host-python3-pyyaml \ host-python3-pyyaml \
gnutls gnutls

2
package/mesa3d/mesa3d.mk
View File

@ -20,7 +20,7 @@ MESA3D_PROVIDES =
MESA3D_DEPENDENCIES = \ MESA3D_DEPENDENCIES = \
host-bison \ host-bison \
host-flex \ host-flex \
host-python3-mako \ host-python-mako \
expat \ expat \
libdrm \ libdrm \
zlib zlib

1
package/python-flask-babel/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_FLASK_BABEL config BR2_PACKAGE_PYTHON_FLASK_BABEL
bool "python-flask-babel" bool "python-flask-babel"
depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_FLASK # runtime
select BR2_PACKAGE_PYTHON_BABEL # runtime select BR2_PACKAGE_PYTHON_BABEL # runtime
select BR2_PACKAGE_PYTHON_JINJA2 # runtime select BR2_PACKAGE_PYTHON_JINJA2 # runtime

1
package/python-flask-cors/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_FLASK_CORS config BR2_PACKAGE_PYTHON_FLASK_CORS
bool "python-flask-cors" bool "python-flask-cors"
depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_FLASK # runtime
select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_SIX # runtime
help help

1
package/python-flask-expects-json/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_FLASK_EXPECTS_JSON config BR2_PACKAGE_PYTHON_FLASK_EXPECTS_JSON
bool "python-flask-expects-json" bool "python-flask-expects-json"
depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_FLASK # runtime
select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime
help help

1
package/python-flask-jsonrpc/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_FLASK_JSONRPC config BR2_PACKAGE_PYTHON_FLASK_JSONRPC
bool "python-flask-jsonrpc" bool "python-flask-jsonrpc"
depends on BR2_PACKAGE_PYTHON3
# runtime dependency # runtime dependency
select BR2_PACKAGE_PYTHON_FLASK select BR2_PACKAGE_PYTHON_FLASK
help help

1
package/python-flask-login/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_FLASK_LOGIN config BR2_PACKAGE_PYTHON_FLASK_LOGIN
bool "python-flask-login" bool "python-flask-login"
depends on BR2_PACKAGE_PYTHON3
# runtime dependency # runtime dependency
select BR2_PACKAGE_PYTHON_FLASK select BR2_PACKAGE_PYTHON_FLASK
help help

1
package/python-flask-sqlalchemy/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY config BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY
bool "python-flask-sqlalchemy" bool "python-flask-sqlalchemy"
depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_FLASK # runtime select BR2_PACKAGE_PYTHON_FLASK # runtime
select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime
help help

1
package/python-flask/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_FLASK config BR2_PACKAGE_PYTHON_FLASK
bool "python-flask" bool "python-flask"
depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_CLICK # runtime select BR2_PACKAGE_PYTHON_CLICK # runtime
select BR2_PACKAGE_PYTHON_JINJA2 # runtime select BR2_PACKAGE_PYTHON_JINJA2 # runtime
select BR2_PACKAGE_PYTHON_WERKZEUG # runtime select BR2_PACKAGE_PYTHON_WERKZEUG # runtime

4
package/python-jinja2/Config.in
View File

@ -1,8 +1,8 @@
config BR2_PACKAGE_PYTHON_JINJA2 config BR2_PACKAGE_PYTHON_JINJA2
bool "python-jinja2" bool "python-jinja2"
depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime
select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON select BR2_PACKAGE_PYTHON3_UNICODEDATA
select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3
help help
Jinja2 is a template engine written in pure Python. It Jinja2 is a template engine written in pure Python. It
provides a Django inspired non-XML syntax but supports provides a Django inspired non-XML syntax but supports

16
package/python-jinja2/python-jinja2.mk
View File

@ -4,7 +4,6 @@
# #
################################################################################ ################################################################################
# Please keep in sync with package/python3-jinja2/python3-jinja2.mk
PYTHON_JINJA2_VERSION = 2.11.3 PYTHON_JINJA2_VERSION = 2.11.3
PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz
PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/4f/e7/65300e6b32e69768ded990494809106f87da1d436418d5f1367ed3966fd7 PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/4f/e7/65300e6b32e69768ded990494809106f87da1d436418d5f1367ed3966fd7
@ -14,20 +13,11 @@ PYTHON_JINJA2_LICENSE_FILES = LICENSE.rst
PYTHON_JINJA2_CPE_ID_VENDOR = pocoo PYTHON_JINJA2_CPE_ID_VENDOR = pocoo
PYTHON_JINJA2_CPE_ID_PRODUCT = jinja2 PYTHON_JINJA2_CPE_ID_PRODUCT = jinja2
# In host build, setup.py tries to download markupsafe if it is not installed # In host/target build, setup.py tries to download markupsafe if it is not installed
PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe
HOST_PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe HOST_PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe
# Both asyncsupport.py and asyncfilters.py use async feature, that is HOST_PYTHON_JINJA2_NEEDS_HOST_PYTHON = python3
# not available in Python 2 and some features available in Python 3.6.
# So in both cases *.py compilation would produce compiler errors.
# Hence remove both files after package extraction.
ifeq ($(BR2_PACKAGE_PYTHON),y)
define PYTHON_JINJA2_REMOVE_ASYNC_SUPPORT
rm $(@D)/src/jinja2/asyncsupport.py $(@D)/src/jinja2/asyncfilters.py
endef
PYTHON_JINJA2_POST_EXTRACT_HOOKS = PYTHON_JINJA2_REMOVE_ASYNC_SUPPORT
endif
$(eval $(python-package)) $(eval $(python-package))
$(eval $(host-python-package)) $(eval $(host-python-package))

4
package/python-mako/python-mako.mk
View File

@ -4,8 +4,6 @@
# #
################################################################################ ################################################################################
# Please keep in sync with
# package/python3-mako/python3-mako.mk
PYTHON_MAKO_VERSION = 1.1.5 PYTHON_MAKO_VERSION = 1.1.5
PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz
PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/d1/42/ff293411e980debfc647be9306d89840c8b82ea24571b014f1a35b2ad80f PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/d1/42/ff293411e980debfc647be9306d89840c8b82ea24571b014f1a35b2ad80f
@ -13,6 +11,8 @@ PYTHON_MAKO_SETUP_TYPE = setuptools
PYTHON_MAKO_LICENSE = MIT PYTHON_MAKO_LICENSE = MIT
PYTHON_MAKO_LICENSE_FILES = LICENSE PYTHON_MAKO_LICENSE_FILES = LICENSE
HOST_PYTHON_MAKO_NEEDS_HOST_PYTHON = python3
# In host build, setup.py tries to download markupsafe if it is not installed # In host build, setup.py tries to download markupsafe if it is not installed
HOST_PYTHON_MAKO_DEPENDENCIES = host-python-markupsafe HOST_PYTHON_MAKO_DEPENDENCIES = host-python-markupsafe

1
package/python-markupsafe/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_MARKUPSAFE config BR2_PACKAGE_PYTHON_MARKUPSAFE
bool "python-markupsafe" bool "python-markupsafe"
depends on BR2_PACKAGE_PYTHON3
help help
MarkupSafe implements a XML/HTML/XHTML Markup safe string MarkupSafe implements a XML/HTML/XHTML Markup safe string
for Python. for Python.

9
package/python-markupsafe/python-markupsafe.hash
View File

@ -1,4 +1,5 @@
# md5 from https://pypi.python.org/pypi/markupsafe/json, sha256 locally computed # md5, sha256 from https://pypi.org/pypi/markupsafe/json
md5 43fd756864fe42063068e092e220c57b MarkupSafe-1.1.1.tar.gz md5 892e0fefa3c488387e5cc0cad2daa523 MarkupSafe-2.0.1.tar.gz
sha256 29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b MarkupSafe-1.1.1.tar.gz sha256 594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a MarkupSafe-2.0.1.tar.gz
sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst # Locally computed sha256 checksums
sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst

7
package/python-markupsafe/python-markupsafe.mk
View File

@ -4,13 +4,14 @@
# #
################################################################################ ################################################################################
# Please keep in sync with package/python3-markupsafe/python3-markupsafe.mk PYTHON_MARKUPSAFE_VERSION = 2.0.1
PYTHON_MARKUPSAFE_VERSION = 1.1.1
PYTHON_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON_MARKUPSAFE_VERSION).tar.gz PYTHON_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON_MARKUPSAFE_VERSION).tar.gz
PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094 PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/bf/10/ff66fea6d1788c458663a84d88787bae15d45daa16f6b3ef33322a51fc7e
PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools
PYTHON_MARKUPSAFE_LICENSE = BSD-3-Clause PYTHON_MARKUPSAFE_LICENSE = BSD-3-Clause
PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst
HOST_PYTHON_MARKUPSAFE_NEEDS_HOST_PYTHON = python3
$(eval $(python-package)) $(eval $(python-package))
$(eval $(host-python-package)) $(eval $(host-python-package))

1
package/python-wtforms/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_WTFORMS config BR2_PACKAGE_PYTHON_WTFORMS
bool "python-wtforms" bool "python-wtforms"
depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime
help help
A flexible forms validation and rendering library for A flexible forms validation and rendering library for

1
package/python3-jinja2/python3-jinja2.hash
View File

@ -1 +0,0 @@
../python-jinja2/python-jinja2.hash

20
package/python3-jinja2/python3-jinja2.mk
View File

@ -1,20 +0,0 @@
################################################################################
#
# python3-jinja2
#
################################################################################
PYTHON3_JINJA2_VERSION = 2.11.3
PYTHON3_JINJA2_SOURCE = Jinja2-$(PYTHON3_JINJA2_VERSION).tar.gz
PYTHON3_JINJA2_SITE = https://files.pythonhosted.org/packages/4f/e7/65300e6b32e69768ded990494809106f87da1d436418d5f1367ed3966fd7
PYTHON3_JINJA2_SETUP_TYPE = setuptools
PYTHON3_JINJA2_LICENSE = BSD-3-Clause
PYTHON3_JINJA2_LICENSE_FILES = LICENSE.rst
PYTHON3_JINJA2_CPE_ID_VENDOR = pocoo
PYTHON3_JINJA2_CPE_ID_PRODUCT = jinja2
HOST_PYTHON3_JINJA2_NEEDS_HOST_PYTHON = python3
# In host build, setup.py tries to download markupsafe if it is not installed
HOST_PYTHON3_JINJA2_DEPENDENCIES = host-python3-markupsafe
$(eval $(host-python-package))

1
package/python3-mako/python3-mako.hash
View File

@ -1 +0,0 @@
../python-mako/python-mako.hash

18
package/python3-mako/python3-mako.mk
View File

@ -1,18 +0,0 @@
################################################################################
#
# python3-mako
#
################################################################################
# Please keep in sync with
# package/python-mako/python-mako.mk
PYTHON3_MAKO_VERSION = 1.1.5
PYTHON3_MAKO_SOURCE = Mako-$(PYTHON3_MAKO_VERSION).tar.gz
PYTHON3_MAKO_SITE = https://files.pythonhosted.org/packages/d1/42/ff293411e980debfc647be9306d89840c8b82ea24571b014f1a35b2ad80f
PYTHON3_MAKO_SETUP_TYPE = setuptools
PYTHON3_MAKO_LICENSE = MIT
PYTHON3_MAKO_LICENSE_FILES = LICENSE
HOST_PYTHON3_MAKO_DL_SUBDIR = python-mako
HOST_PYTHON3_MAKO_NEEDS_HOST_PYTHON = python3
$(eval $(host-python-package))

1
package/python3-markupsafe/python3-markupsafe.hash
View File

@ -1 +0,0 @@
../python-markupsafe/python-markupsafe.hash

16
package/python3-markupsafe/python3-markupsafe.mk
View File

@ -1,16 +0,0 @@
################################################################################
#
# python3-markupsafe
#
################################################################################
PYTHON3_MARKUPSAFE_VERSION = 1.1.1
PYTHON3_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON3_MARKUPSAFE_VERSION).tar.gz
PYTHON3_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094
PYTHON3_MARKUPSAFE_SETUP_TYPE = setuptools
PYTHON3_MARKUPSAFE_LICENSE = BSD-3-Clause
PYTHON3_MARKUPSAFE_LICENSE_FILES = LICENSE.rst
HOST_PYTHON3_MARKUPSAFE_NEEDS_HOST_PYTHON = python3
$(eval $(host-python-package))

4
package/systemd/systemd.mk
View File

@ -14,7 +14,7 @@ SYSTEMD_DEPENDENCIES = \
$(BR2_COREUTILS_HOST_DEPENDENCY) \ $(BR2_COREUTILS_HOST_DEPENDENCY) \
$(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \
host-gperf \ host-gperf \
host-python3-jinja2 \ host-python-jinja2 \
kmod \ kmod \
libcap \ libcap \
util-linux-libs \ util-linux-libs \
@ -738,7 +738,7 @@ HOST_SYSTEMD_DEPENDENCIES = \
host-patchelf \ host-patchelf \
host-libcap \ host-libcap \
host-gperf \ host-gperf \
host-python3-jinja2 host-python-jinja2
HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR) HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR)

2
package/uhd/uhd.mk
View File

@ -15,7 +15,7 @@ UHD_INSTALL_STAGING = YES
UHD_DEPENDENCIES = \ UHD_DEPENDENCIES = \
boost \ boost \
$(if $(BR2_PACKAGE_PYTHON),host-python,host-python3) \ host-python3 \
host-python-mako host-python-mako
UHD_CONF_OPTS = \ UHD_CONF_OPTS = \