* [Buildroot] [PATCH 1/2] package/python-markupsafe: bump to version 2.0.1
@ 2021-10-07 19:31 James Hilliard
2021-10-07 19:31 ` [Buildroot] [PATCH 2/2] package/python-jinja2: bump to version 3.0.2 James Hilliard
2021-10-14 20:37 ` [Buildroot] [PATCH 1/2] package/python-markupsafe: bump to version 2.0.1 Arnout Vandecappelle
0 siblings, 2 replies; 4+ messages in thread
From: James Hilliard @ 2021-10-07 19:31 UTC (permalink / raw)
To: buildroot
Cc: Matt Weber, Grzegorz Blach, Kieran Bingham, Asaf Kahlon,
James Hilliard, Peter Seiderer, Lionel Flandrin,
Thomas Petazzoni, Norbert Lange, Yann E . MORIN
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.
Propagate reverse python3 dependency.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
package/python-flask-babel/Config.in | 1 +
package/python-flask-cors/Config.in | 1 +
package/python-flask-expects-json/Config.in | 1 +
package/python-flask-jsonrpc/Config.in | 1 +
package/python-flask-login/Config.in | 1 +
package/python-flask-sqlalchemy/Config.in | 1 +
package/python-flask-wtf/Config.in | 1 +
package/python-flask/Config.in | 1 +
package/python-jinja2/Config.in | 1 +
package/python-markupsafe/Config.in | 1 +
package/python-markupsafe/python-markupsafe.hash | 9 +++++----
package/python-markupsafe/python-markupsafe.mk | 7 ++++---
package/python-wtforms/Config.in | 1 +
package/python3-jinja2/python3-jinja2.mk | 2 +-
.../python3-markupsafe/python3-markupsafe.hash | 1 -
package/python3-markupsafe/python3-markupsafe.mk | 16 ----------------
16 files changed, 21 insertions(+), 25 deletions(-)
delete mode 120000 package/python3-markupsafe/python3-markupsafe.hash
delete mode 100644 package/python3-markupsafe/python3-markupsafe.mk
diff --git a/package/python-flask-babel/Config.in b/package/python-flask-babel/Config.in
index 272d9ef1c1..52f05f1e6a 100644
--- a/package/python-flask-babel/Config.in
+++ b/package/python-flask-babel/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_FLASK_BABEL
bool "python-flask-babel"
+ depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_FLASK # runtime
select BR2_PACKAGE_PYTHON_BABEL # runtime
select BR2_PACKAGE_PYTHON_JINJA2 # runtime
diff --git a/package/python-flask-cors/Config.in b/package/python-flask-cors/Config.in
index e2e84797f9..f34f77e5b0 100644
--- a/package/python-flask-cors/Config.in
+++ b/package/python-flask-cors/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_FLASK_CORS
bool "python-flask-cors"
+ depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_FLASK # runtime
select BR2_PACKAGE_PYTHON_SIX # runtime
help
diff --git a/package/python-flask-expects-json/Config.in b/package/python-flask-expects-json/Config.in
index 901234762e..efe4c248d3 100644
--- a/package/python-flask-expects-json/Config.in
+++ b/package/python-flask-expects-json/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_FLASK_EXPECTS_JSON
bool "python-flask-expects-json"
+ depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_FLASK # runtime
select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime
help
diff --git a/package/python-flask-jsonrpc/Config.in b/package/python-flask-jsonrpc/Config.in
index c8ecd854b3..4bc13f9bcb 100644
--- a/package/python-flask-jsonrpc/Config.in
+++ b/package/python-flask-jsonrpc/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_FLASK_JSONRPC
bool "python-flask-jsonrpc"
+ depends on BR2_PACKAGE_PYTHON3
# runtime dependency
select BR2_PACKAGE_PYTHON_FLASK
help
diff --git a/package/python-flask-login/Config.in b/package/python-flask-login/Config.in
index 88c413e2a2..00fa58d783 100644
--- a/package/python-flask-login/Config.in
+++ b/package/python-flask-login/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_FLASK_LOGIN
bool "python-flask-login"
+ depends on BR2_PACKAGE_PYTHON3
# runtime dependency
select BR2_PACKAGE_PYTHON_FLASK
help
diff --git a/package/python-flask-sqlalchemy/Config.in b/package/python-flask-sqlalchemy/Config.in
index fa4a035110..e96bd7078c 100644
--- a/package/python-flask-sqlalchemy/Config.in
+++ b/package/python-flask-sqlalchemy/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY
bool "python-flask-sqlalchemy"
+ depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_FLASK # runtime
select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime
help
diff --git a/package/python-flask-wtf/Config.in b/package/python-flask-wtf/Config.in
index bb15489956..022ea89265 100644
--- a/package/python-flask-wtf/Config.in
+++ b/package/python-flask-wtf/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_FLASK_WTF
bool "python-flask-wtf"
+ depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_FLASK # runtime
select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime
select BR2_PACKAGE_PYTHON_WTFORMS # runtime
diff --git a/package/python-flask/Config.in b/package/python-flask/Config.in
index 0e5b64ce59..56bfe10f01 100644
--- a/package/python-flask/Config.in
+++ b/package/python-flask/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_FLASK
bool "python-flask"
+ depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_CLICK # runtime
select BR2_PACKAGE_PYTHON_JINJA2 # runtime
select BR2_PACKAGE_PYTHON_WERKZEUG # runtime
diff --git a/package/python-jinja2/Config.in b/package/python-jinja2/Config.in
index 5b99df75b8..27f6b1a7dd 100644
--- a/package/python-jinja2/Config.in
+++ b/package/python-jinja2/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_JINJA2
bool "python-jinja2"
+ depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime
select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON
select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3
diff --git a/package/python-markupsafe/Config.in b/package/python-markupsafe/Config.in
index 48421e0a32..cd7cb2d8e9 100644
--- a/package/python-markupsafe/Config.in
+++ b/package/python-markupsafe/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_MARKUPSAFE
bool "python-markupsafe"
+ depends on BR2_PACKAGE_PYTHON3
help
MarkupSafe implements a XML/HTML/XHTML Markup safe string
for Python.
diff --git a/package/python-markupsafe/python-markupsafe.hash b/package/python-markupsafe/python-markupsafe.hash
index df07662a86..520bb405fb 100644
--- a/package/python-markupsafe/python-markupsafe.hash
+++ b/package/python-markupsafe/python-markupsafe.hash
@@ -1,4 +1,5 @@
-# md5 from https://pypi.python.org/pypi/markupsafe/json, sha256 locally computed
-md5 43fd756864fe42063068e092e220c57b MarkupSafe-1.1.1.tar.gz
-sha256 29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b MarkupSafe-1.1.1.tar.gz
-sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst
+# md5, sha256 from https://pypi.org/pypi/markupsafe/json
+md5 892e0fefa3c488387e5cc0cad2daa523 MarkupSafe-2.0.1.tar.gz
+sha256 594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a MarkupSafe-2.0.1.tar.gz
+# Locally computed sha256 checksums
+sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst
diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk
index f067d94f34..14a8d06dfe 100644
--- a/package/python-markupsafe/python-markupsafe.mk
+++ b/package/python-markupsafe/python-markupsafe.mk
@@ -4,13 +4,14 @@
#
################################################################################
-# Please keep in sync with package/python3-markupsafe/python3-markupsafe.mk
-PYTHON_MARKUPSAFE_VERSION = 1.1.1
+PYTHON_MARKUPSAFE_VERSION = 2.0.1
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_LICENSE = BSD-3-Clause
PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst
+HOST_PYTHON_MARKUPSAFE_NEEDS_HOST_PYTHON = python3
+
$(eval $(python-package))
$(eval $(host-python-package))
diff --git a/package/python-wtforms/Config.in b/package/python-wtforms/Config.in
index 33a17d3d37..0cc136fc13 100644
--- a/package/python-wtforms/Config.in
+++ b/package/python-wtforms/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_WTFORMS
bool "python-wtforms"
+ depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime
help
A flexible forms validation and rendering library for
diff --git a/package/python3-jinja2/python3-jinja2.mk b/package/python3-jinja2/python3-jinja2.mk
index 5d29e1d889..41081db04a 100644
--- a/package/python3-jinja2/python3-jinja2.mk
+++ b/package/python3-jinja2/python3-jinja2.mk
@@ -15,6 +15,6 @@ 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
+HOST_PYTHON3_JINJA2_DEPENDENCIES = host-python-markupsafe
$(eval $(host-python-package))
diff --git a/package/python3-markupsafe/python3-markupsafe.hash b/package/python3-markupsafe/python3-markupsafe.hash
deleted file mode 120000
index 947cfa12d7..0000000000
--- a/package/python3-markupsafe/python3-markupsafe.hash
+++ /dev/null
@@ -1 +0,0 @@
-../python-markupsafe/python-markupsafe.hash
\ No newline at end of file
diff --git a/package/python3-markupsafe/python3-markupsafe.mk b/package/python3-markupsafe/python3-markupsafe.mk
deleted file mode 100644
index 58f6e67b64..0000000000
--- a/package/python3-markupsafe/python3-markupsafe.mk
+++ /dev/null
@@ -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))
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] package/python-jinja2: bump to version 3.0.2
2021-10-07 19:31 [Buildroot] [PATCH 1/2] package/python-markupsafe: bump to version 2.0.1 James Hilliard
@ 2021-10-07 19:31 ` James Hilliard
2021-10-14 20:37 ` [Buildroot] [PATCH 1/2] package/python-markupsafe: bump to version 2.0.1 Arnout Vandecappelle
1 sibling, 0 replies; 4+ messages in thread
From: James Hilliard @ 2021-10-07 19:31 UTC (permalink / raw)
To: buildroot
Cc: Matt Weber, Grzegorz Blach, Kieran Bingham, Asaf Kahlon,
James Hilliard, Peter Seiderer, Lionel Flandrin,
Thomas Petazzoni, Norbert Lange, Yann E . MORIN
Drop python2 support.
Remove python3-jinja2 host build as python2 host builds for
jinja2 are not supported, python3 host builds are moved to
python-jinja2.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
package/libcamera/libcamera.mk | 2 +-
package/python-jinja2/Config.in | 2 --
package/python-jinja2/python-jinja2.hash | 4 ++--
package/python-jinja2/python-jinja2.mk | 20 +++++---------------
package/python3-jinja2/python3-jinja2.hash | 1 -
package/python3-jinja2/python3-jinja2.mk | 20 --------------------
package/systemd/systemd.mk | 4 ++--
7 files changed, 10 insertions(+), 43 deletions(-)
delete mode 120000 package/python3-jinja2/python3-jinja2.hash
delete mode 100644 package/python3-jinja2/python3-jinja2.mk
diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk
index 8ab95fb42a..55242584da 100644
--- a/package/libcamera/libcamera.mk
+++ b/package/libcamera/libcamera.mk
@@ -10,7 +10,7 @@ LIBCAMERA_SITE_METHOD = git
LIBCAMERA_DEPENDENCIES = \
host-openssl \
host-pkgconf \
- host-python3-jinja2 \
+ host-python-jinja2 \
host-python3-ply \
host-python3-pyyaml \
gnutls
diff --git a/package/python-jinja2/Config.in b/package/python-jinja2/Config.in
index 27f6b1a7dd..36a68083e6 100644
--- a/package/python-jinja2/Config.in
+++ b/package/python-jinja2/Config.in
@@ -2,8 +2,6 @@ config BR2_PACKAGE_PYTHON_JINJA2
bool "python-jinja2"
depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime
- select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON
- select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3
help
Jinja2 is a template engine written in pure Python. It
provides a Django inspired non-XML syntax but supports
diff --git a/package/python-jinja2/python-jinja2.hash b/package/python-jinja2/python-jinja2.hash
index 51590b17d2..afd07e89f1 100644
--- a/package/python-jinja2/python-jinja2.hash
+++ b/package/python-jinja2/python-jinja2.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/jinja2/json
-md5 231dc00d34afb2672c497713fa9cdaaa Jinja2-2.11.3.tar.gz
-sha256 a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6 Jinja2-2.11.3.tar.gz
+md5 059f89375d7ea60eb7013f341f0b89e7 Jinja2-3.0.2.tar.gz
+sha256 827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45 Jinja2-3.0.2.tar.gz
# Locally computed sha256 checksums
sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst
diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk
index f91cac6937..bb53f95699 100644
--- a/package/python-jinja2/python-jinja2.mk
+++ b/package/python-jinja2/python-jinja2.mk
@@ -4,30 +4,20 @@
#
################################################################################
-# Please keep in sync with package/python3-jinja2/python3-jinja2.mk
-PYTHON_JINJA2_VERSION = 2.11.3
+PYTHON_JINJA2_VERSION = 3.0.2
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/f8/86/7c0eb6e8b05385d1ce682abc0f994abd1668e148fb52603fa86e15d4c110
PYTHON_JINJA2_SETUP_TYPE = setuptools
PYTHON_JINJA2_LICENSE = BSD-3-Clause
PYTHON_JINJA2_LICENSE_FILES = LICENSE.rst
PYTHON_JINJA2_CPE_ID_VENDOR = pocoo
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
-# Both asyncsupport.py and asyncfilters.py use async feature, that is
-# 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
+HOST_PYTHON_JINJA2_NEEDS_HOST_PYTHON = python3
$(eval $(python-package))
$(eval $(host-python-package))
diff --git a/package/python3-jinja2/python3-jinja2.hash b/package/python3-jinja2/python3-jinja2.hash
deleted file mode 120000
index 543e981aa0..0000000000
--- a/package/python3-jinja2/python3-jinja2.hash
+++ /dev/null
@@ -1 +0,0 @@
-../python-jinja2/python-jinja2.hash
\ No newline at end of file
diff --git a/package/python3-jinja2/python3-jinja2.mk b/package/python3-jinja2/python3-jinja2.mk
deleted file mode 100644
index 41081db04a..0000000000
--- a/package/python3-jinja2/python3-jinja2.mk
+++ /dev/null
@@ -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-python-markupsafe
-
-$(eval $(host-python-package))
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index c403896759..5b4fd57cd3 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -14,7 +14,7 @@ SYSTEMD_DEPENDENCIES = \
$(BR2_COREUTILS_HOST_DEPENDENCY) \
$(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \
host-gperf \
- host-python3-jinja2 \
+ host-python-jinja2 \
kmod \
libcap \
util-linux-libs \
@@ -739,7 +739,7 @@ HOST_SYSTEMD_DEPENDENCIES = \
host-patchelf \
host-libcap \
host-gperf \
- host-python3-jinja2
+ host-python-jinja2
HOST_SYSTEMD_NINJA_ENV = DESTDIR=$(HOST_DIR)
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/python-markupsafe: bump to version 2.0.1
2021-10-07 19:31 [Buildroot] [PATCH 1/2] package/python-markupsafe: bump to version 2.0.1 James Hilliard
2021-10-07 19:31 ` [Buildroot] [PATCH 2/2] package/python-jinja2: bump to version 3.0.2 James Hilliard
@ 2021-10-14 20:37 ` Arnout Vandecappelle
2021-10-14 21:00 ` James Hilliard
1 sibling, 1 reply; 4+ messages in thread
From: Arnout Vandecappelle @ 2021-10-14 20:37 UTC (permalink / raw)
To: James Hilliard, buildroot
Cc: Grzegorz Blach, Kieran Bingham, Asaf Kahlon, Yann E . MORIN,
Peter Seiderer, Thomas Petazzoni, Lionel Flandrin, Matt Weber,
Norbert Lange
Hi James,
Quote a few changes needed I'm afraid...
On 07/10/2021 21:31, James Hilliard wrote:
> 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.
>
> Propagate reverse python3 dependency.
>
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
> package/python-flask-babel/Config.in | 1 +
> package/python-flask-cors/Config.in | 1 +
> package/python-flask-expects-json/Config.in | 1 +
> package/python-flask-jsonrpc/Config.in | 1 +
> package/python-flask-login/Config.in | 1 +
> package/python-flask-sqlalchemy/Config.in | 1 +
> package/python-flask-wtf/Config.in | 1 +
> package/python-flask/Config.in | 1 +
> package/python-jinja2/Config.in | 1 +
> package/python-markupsafe/Config.in | 1 +
> package/python-markupsafe/python-markupsafe.hash | 9 +++++----
> package/python-markupsafe/python-markupsafe.mk | 7 ++++---
> package/python-wtforms/Config.in | 1 +
> package/python3-jinja2/python3-jinja2.mk | 2 +-
> .../python3-markupsafe/python3-markupsafe.hash | 1 -
> package/python3-markupsafe/python3-markupsafe.mk | 16 ----------------
> 16 files changed, 21 insertions(+), 25 deletions(-)
> delete mode 120000 package/python3-markupsafe/python3-markupsafe.hash
> delete mode 100644 package/python3-markupsafe/python3-markupsafe.mk
>
> diff --git a/package/python-flask-babel/Config.in b/package/python-flask-babel/Config.in
> index 272d9ef1c1..52f05f1e6a 100644
> --- a/package/python-flask-babel/Config.in
> +++ b/package/python-flask-babel/Config.in
> @@ -1,5 +1,6 @@
> config BR2_PACKAGE_PYTHON_FLASK_BABEL
> bool "python-flask-babel"
> + depends on BR2_PACKAGE_PYTHON3
We normally put a comment behind it to say where it comes from, if the package
itself doesn't directly depend on python3.
> select BR2_PACKAGE_PYTHON_FLASK # runtime
> select BR2_PACKAGE_PYTHON_BABEL # runtime
> select BR2_PACKAGE_PYTHON_JINJA2 # runtime
> diff --git a/package/python-flask-cors/Config.in b/package/python-flask-cors/Config.in
> index e2e84797f9..f34f77e5b0 100644
> --- a/package/python-flask-cors/Config.in
> +++ b/package/python-flask-cors/Config.in
> @@ -1,5 +1,6 @@
> config BR2_PACKAGE_PYTHON_FLASK_CORS
> bool "python-flask-cors"
> + depends on BR2_PACKAGE_PYTHON3
> select BR2_PACKAGE_PYTHON_FLASK # runtime
> select BR2_PACKAGE_PYTHON_SIX # runtime
You should check if six is really needed if it's python3 only (some packages
drop the dependency on six if it's python3 anyway). Just check if any match of
`import .*six' is conditional or not.
> help
> diff --git a/package/python-flask-expects-json/Config.in b/package/python-flask-expects-json/Config.in
> index 901234762e..efe4c248d3 100644
> --- a/package/python-flask-expects-json/Config.in
> +++ b/package/python-flask-expects-json/Config.in
> @@ -1,5 +1,6 @@
> config BR2_PACKAGE_PYTHON_FLASK_EXPECTS_JSON
> bool "python-flask-expects-json"
> + depends on BR2_PACKAGE_PYTHON3
> select BR2_PACKAGE_PYTHON_FLASK # runtime
> select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime
> help
> diff --git a/package/python-flask-jsonrpc/Config.in b/package/python-flask-jsonrpc/Config.in
> index c8ecd854b3..4bc13f9bcb 100644
> --- a/package/python-flask-jsonrpc/Config.in
> +++ b/package/python-flask-jsonrpc/Config.in
> @@ -1,5 +1,6 @@
> config BR2_PACKAGE_PYTHON_FLASK_JSONRPC
> bool "python-flask-jsonrpc"
> + depends on BR2_PACKAGE_PYTHON3
> # runtime dependency
> select BR2_PACKAGE_PYTHON_FLASK
> help
> diff --git a/package/python-flask-login/Config.in b/package/python-flask-login/Config.in
> index 88c413e2a2..00fa58d783 100644
> --- a/package/python-flask-login/Config.in
> +++ b/package/python-flask-login/Config.in
> @@ -1,5 +1,6 @@
> config BR2_PACKAGE_PYTHON_FLASK_LOGIN
> bool "python-flask-login"
> + depends on BR2_PACKAGE_PYTHON3
> # runtime dependency
> select BR2_PACKAGE_PYTHON_FLASK
> help
> diff --git a/package/python-flask-sqlalchemy/Config.in b/package/python-flask-sqlalchemy/Config.in
> index fa4a035110..e96bd7078c 100644
> --- a/package/python-flask-sqlalchemy/Config.in
> +++ b/package/python-flask-sqlalchemy/Config.in
> @@ -1,5 +1,6 @@
> config BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY
> bool "python-flask-sqlalchemy"
> + depends on BR2_PACKAGE_PYTHON3
> select BR2_PACKAGE_PYTHON_FLASK # runtime
> select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime
> help
> diff --git a/package/python-flask-wtf/Config.in b/package/python-flask-wtf/Config.in
> index bb15489956..022ea89265 100644
> --- a/package/python-flask-wtf/Config.in
> +++ b/package/python-flask-wtf/Config.in
> @@ -1,5 +1,6 @@
> config BR2_PACKAGE_PYTHON_FLASK_WTF
> bool "python-flask-wtf"
> + depends on BR2_PACKAGE_PYTHON3
> select BR2_PACKAGE_PYTHON_FLASK # runtime
> select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime
> select BR2_PACKAGE_PYTHON_WTFORMS # runtime
> diff --git a/package/python-flask/Config.in b/package/python-flask/Config.in
> index 0e5b64ce59..56bfe10f01 100644
> --- a/package/python-flask/Config.in
> +++ b/package/python-flask/Config.in
> @@ -1,5 +1,6 @@
> config BR2_PACKAGE_PYTHON_FLASK
> bool "python-flask"
> + depends on BR2_PACKAGE_PYTHON3
> select BR2_PACKAGE_PYTHON_CLICK # runtime
> select BR2_PACKAGE_PYTHON_JINJA2 # runtime
> select BR2_PACKAGE_PYTHON_WERKZEUG # runtime
> diff --git a/package/python-jinja2/Config.in b/package/python-jinja2/Config.in
> index 5b99df75b8..27f6b1a7dd 100644
> --- a/package/python-jinja2/Config.in
> +++ b/package/python-jinja2/Config.in
> @@ -1,5 +1,6 @@
> config BR2_PACKAGE_PYTHON_JINJA2
> bool "python-jinja2"
> + depends on BR2_PACKAGE_PYTHON3
> select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime
> select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON
This should be removed. There are a bunch of those in various packages.
> select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3
The condition part of this one should also be removed.
python-jinja2 has a host variant. Making it python3-only means you also have
to set HOST_PYTHON_JINJA2_NEEDS_HOST_PYTHON = python3
(there may be others as well)
> diff --git a/package/python-markupsafe/Config.in b/package/python-markupsafe/Config.in
> index 48421e0a32..cd7cb2d8e9 100644
> --- a/package/python-markupsafe/Config.in
> +++ b/package/python-markupsafe/Config.in
> @@ -1,5 +1,6 @@
> config BR2_PACKAGE_PYTHON_MARKUPSAFE
> bool "python-markupsafe"
> + depends on BR2_PACKAGE_PYTHON3
> help
> MarkupSafe implements a XML/HTML/XHTML Markup safe string
> for Python.
> diff --git a/package/python-markupsafe/python-markupsafe.hash b/package/python-markupsafe/python-markupsafe.hash
> index df07662a86..520bb405fb 100644
> --- a/package/python-markupsafe/python-markupsafe.hash
> +++ b/package/python-markupsafe/python-markupsafe.hash
> @@ -1,4 +1,5 @@
> -# md5 from https://pypi.python.org/pypi/markupsafe/json, sha256 locally computed
> -md5 43fd756864fe42063068e092e220c57b MarkupSafe-1.1.1.tar.gz
> -sha256 29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b MarkupSafe-1.1.1.tar.gz
> -sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst
> +# md5, sha256 from https://pypi.org/pypi/markupsafe/json
> +md5 892e0fefa3c488387e5cc0cad2daa523 MarkupSafe-2.0.1.tar.gz
> +sha256 594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a MarkupSafe-2.0.1.tar.gz
> +# Locally computed sha256 checksums
> +sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst
> diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk
> index f067d94f34..14a8d06dfe 100644
> --- a/package/python-markupsafe/python-markupsafe.mk
> +++ b/package/python-markupsafe/python-markupsafe.mk
> @@ -4,13 +4,14 @@
> #
> ################################################################################
>
> -# Please keep in sync with package/python3-markupsafe/python3-markupsafe.mk
> -PYTHON_MARKUPSAFE_VERSION = 1.1.1
> +PYTHON_MARKUPSAFE_VERSION = 2.0.1
> 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_LICENSE = BSD-3-Clause
> PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst
>
> +HOST_PYTHON_MARKUPSAFE_NEEDS_HOST_PYTHON = python3
Yes, like this :-)
> +
> $(eval $(python-package))
> $(eval $(host-python-package))
> diff --git a/package/python-wtforms/Config.in b/package/python-wtforms/Config.in
> index 33a17d3d37..0cc136fc13 100644
> --- a/package/python-wtforms/Config.in
> +++ b/package/python-wtforms/Config.in
> @@ -1,5 +1,6 @@
> config BR2_PACKAGE_PYTHON_WTFORMS
> bool "python-wtforms"
> + depends on BR2_PACKAGE_PYTHON3
> select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime
> help
> A flexible forms validation and rendering library for
> diff --git a/package/python3-jinja2/python3-jinja2.mk b/package/python3-jinja2/python3-jinja2.mk
> index 5d29e1d889..41081db04a 100644
> --- a/package/python3-jinja2/python3-jinja2.mk
> +++ b/package/python3-jinja2/python3-jinja2.mk
> @@ -15,6 +15,6 @@ 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
> +HOST_PYTHON3_JINJA2_DEPENDENCIES = host-python-markupsafe
Since python-jinja2 became python3-only, this package can be removed entirely.
Regards,
Arnout
>
> $(eval $(host-python-package))
> diff --git a/package/python3-markupsafe/python3-markupsafe.hash b/package/python3-markupsafe/python3-markupsafe.hash
> deleted file mode 120000
> index 947cfa12d7..0000000000
> --- a/package/python3-markupsafe/python3-markupsafe.hash
> +++ /dev/null
> @@ -1 +0,0 @@
> -../python-markupsafe/python-markupsafe.hash
> \ No newline at end of file
> diff --git a/package/python3-markupsafe/python3-markupsafe.mk b/package/python3-markupsafe/python3-markupsafe.mk
> deleted file mode 100644
> index 58f6e67b64..0000000000
> --- a/package/python3-markupsafe/python3-markupsafe.mk
> +++ /dev/null
> @@ -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))
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/python-markupsafe: bump to version 2.0.1
2021-10-14 20:37 ` [Buildroot] [PATCH 1/2] package/python-markupsafe: bump to version 2.0.1 Arnout Vandecappelle
@ 2021-10-14 21:00 ` James Hilliard
0 siblings, 0 replies; 4+ messages in thread
From: James Hilliard @ 2021-10-14 21:00 UTC (permalink / raw)
To: Arnout Vandecappelle
Cc: Grzegorz Blach, Kieran Bingham, Asaf Kahlon, Yann E . MORIN,
Peter Seiderer, Thomas Petazzoni, buildroot, Lionel Flandrin,
Matt Weber, Norbert Lange
On Thu, Oct 14, 2021 at 2:37 PM Arnout Vandecappelle <arnout@mind.be> wrote:
>
> Hi James,
>
> Quote a few changes needed I'm afraid...
>
> On 07/10/2021 21:31, James Hilliard wrote:
> > 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.
> >
> > Propagate reverse python3 dependency.
> >
> > Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> > ---
> > package/python-flask-babel/Config.in | 1 +
> > package/python-flask-cors/Config.in | 1 +
> > package/python-flask-expects-json/Config.in | 1 +
> > package/python-flask-jsonrpc/Config.in | 1 +
> > package/python-flask-login/Config.in | 1 +
> > package/python-flask-sqlalchemy/Config.in | 1 +
> > package/python-flask-wtf/Config.in | 1 +
> > package/python-flask/Config.in | 1 +
> > package/python-jinja2/Config.in | 1 +
> > package/python-markupsafe/Config.in | 1 +
> > package/python-markupsafe/python-markupsafe.hash | 9 +++++----
> > package/python-markupsafe/python-markupsafe.mk | 7 ++++---
> > package/python-wtforms/Config.in | 1 +
> > package/python3-jinja2/python3-jinja2.mk | 2 +-
> > .../python3-markupsafe/python3-markupsafe.hash | 1 -
> > package/python3-markupsafe/python3-markupsafe.mk | 16 ----------------
> > 16 files changed, 21 insertions(+), 25 deletions(-)
> > delete mode 120000 package/python3-markupsafe/python3-markupsafe.hash
> > delete mode 100644 package/python3-markupsafe/python3-markupsafe.mk
> >
> > diff --git a/package/python-flask-babel/Config.in b/package/python-flask-babel/Config.in
> > index 272d9ef1c1..52f05f1e6a 100644
> > --- a/package/python-flask-babel/Config.in
> > +++ b/package/python-flask-babel/Config.in
> > @@ -1,5 +1,6 @@
> > config BR2_PACKAGE_PYTHON_FLASK_BABEL
> > bool "python-flask-babel"
> > + depends on BR2_PACKAGE_PYTHON3
>
> We normally put a comment behind it to say where it comes from, if the package
> itself doesn't directly depend on python3.
Well it's due to markupsafe and jinja2 being moved to python3 only so figured
would be a bit verbose, also didn't bother since we are preparing to
drop python2
support entirely.
>
> > select BR2_PACKAGE_PYTHON_FLASK # runtime
> > select BR2_PACKAGE_PYTHON_BABEL # runtime
> > select BR2_PACKAGE_PYTHON_JINJA2 # runtime
> > diff --git a/package/python-flask-cors/Config.in b/package/python-flask-cors/Config.in
> > index e2e84797f9..f34f77e5b0 100644
> > --- a/package/python-flask-cors/Config.in
> > +++ b/package/python-flask-cors/Config.in
> > @@ -1,5 +1,6 @@
> > config BR2_PACKAGE_PYTHON_FLASK_CORS
> > bool "python-flask-cors"
> > + depends on BR2_PACKAGE_PYTHON3
> > select BR2_PACKAGE_PYTHON_FLASK # runtime
> > select BR2_PACKAGE_PYTHON_SIX # runtime
>
> You should check if six is really needed if it's python3 only (some packages
> drop the dependency on six if it's python3 anyway). Just check if any match of
> `import .*six' is conditional or not.
It does appear to be still needed as it's an unconditional import:
https://github.com/corydolphin/flask-cors/blob/3.0.10/flask_cors/core.py#L19
>
>
> > help
> > diff --git a/package/python-flask-expects-json/Config.in b/package/python-flask-expects-json/Config.in
> > index 901234762e..efe4c248d3 100644
> > --- a/package/python-flask-expects-json/Config.in
> > +++ b/package/python-flask-expects-json/Config.in
> > @@ -1,5 +1,6 @@
> > config BR2_PACKAGE_PYTHON_FLASK_EXPECTS_JSON
> > bool "python-flask-expects-json"
> > + depends on BR2_PACKAGE_PYTHON3
> > select BR2_PACKAGE_PYTHON_FLASK # runtime
> > select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime
> > help
> > diff --git a/package/python-flask-jsonrpc/Config.in b/package/python-flask-jsonrpc/Config.in
> > index c8ecd854b3..4bc13f9bcb 100644
> > --- a/package/python-flask-jsonrpc/Config.in
> > +++ b/package/python-flask-jsonrpc/Config.in
> > @@ -1,5 +1,6 @@
> > config BR2_PACKAGE_PYTHON_FLASK_JSONRPC
> > bool "python-flask-jsonrpc"
> > + depends on BR2_PACKAGE_PYTHON3
> > # runtime dependency
> > select BR2_PACKAGE_PYTHON_FLASK
> > help
> > diff --git a/package/python-flask-login/Config.in b/package/python-flask-login/Config.in
> > index 88c413e2a2..00fa58d783 100644
> > --- a/package/python-flask-login/Config.in
> > +++ b/package/python-flask-login/Config.in
> > @@ -1,5 +1,6 @@
> > config BR2_PACKAGE_PYTHON_FLASK_LOGIN
> > bool "python-flask-login"
> > + depends on BR2_PACKAGE_PYTHON3
> > # runtime dependency
> > select BR2_PACKAGE_PYTHON_FLASK
> > help
> > diff --git a/package/python-flask-sqlalchemy/Config.in b/package/python-flask-sqlalchemy/Config.in
> > index fa4a035110..e96bd7078c 100644
> > --- a/package/python-flask-sqlalchemy/Config.in
> > +++ b/package/python-flask-sqlalchemy/Config.in
> > @@ -1,5 +1,6 @@
> > config BR2_PACKAGE_PYTHON_FLASK_SQLALCHEMY
> > bool "python-flask-sqlalchemy"
> > + depends on BR2_PACKAGE_PYTHON3
> > select BR2_PACKAGE_PYTHON_FLASK # runtime
> > select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime
> > help
> > diff --git a/package/python-flask-wtf/Config.in b/package/python-flask-wtf/Config.in
> > index bb15489956..022ea89265 100644
> > --- a/package/python-flask-wtf/Config.in
> > +++ b/package/python-flask-wtf/Config.in
> > @@ -1,5 +1,6 @@
> > config BR2_PACKAGE_PYTHON_FLASK_WTF
> > bool "python-flask-wtf"
> > + depends on BR2_PACKAGE_PYTHON3
> > select BR2_PACKAGE_PYTHON_FLASK # runtime
> > select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime
> > select BR2_PACKAGE_PYTHON_WTFORMS # runtime
> > diff --git a/package/python-flask/Config.in b/package/python-flask/Config.in
> > index 0e5b64ce59..56bfe10f01 100644
> > --- a/package/python-flask/Config.in
> > +++ b/package/python-flask/Config.in
> > @@ -1,5 +1,6 @@
> > config BR2_PACKAGE_PYTHON_FLASK
> > bool "python-flask"
> > + depends on BR2_PACKAGE_PYTHON3
> > select BR2_PACKAGE_PYTHON_CLICK # runtime
> > select BR2_PACKAGE_PYTHON_JINJA2 # runtime
> > select BR2_PACKAGE_PYTHON_WERKZEUG # runtime
> > diff --git a/package/python-jinja2/Config.in b/package/python-jinja2/Config.in
> > index 5b99df75b8..27f6b1a7dd 100644
> > --- a/package/python-jinja2/Config.in
> > +++ b/package/python-jinja2/Config.in
> > @@ -1,5 +1,6 @@
> > config BR2_PACKAGE_PYTHON_JINJA2
> > bool "python-jinja2"
> > + depends on BR2_PACKAGE_PYTHON3
> > select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime
> > select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON
>
> This should be removed. There are a bunch of those in various packages.
It's removed here:
https://patchwork.ozlabs.org/project/buildroot/patch/20211007193121.3775311-2-james.hilliard1@gmail.com/
>
> > select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3
>
> The condition part of this one should also be removed.
>
>
> python-jinja2 has a host variant. Making it python3-only means you also have
> to set HOST_PYTHON_JINJA2_NEEDS_HOST_PYTHON = python3
>
> (there may be others as well)
>
> > diff --git a/package/python-markupsafe/Config.in b/package/python-markupsafe/Config.in
> > index 48421e0a32..cd7cb2d8e9 100644
> > --- a/package/python-markupsafe/Config.in
> > +++ b/package/python-markupsafe/Config.in
> > @@ -1,5 +1,6 @@
> > config BR2_PACKAGE_PYTHON_MARKUPSAFE
> > bool "python-markupsafe"
> > + depends on BR2_PACKAGE_PYTHON3
> > help
> > MarkupSafe implements a XML/HTML/XHTML Markup safe string
> > for Python.
> > diff --git a/package/python-markupsafe/python-markupsafe.hash b/package/python-markupsafe/python-markupsafe.hash
> > index df07662a86..520bb405fb 100644
> > --- a/package/python-markupsafe/python-markupsafe.hash
> > +++ b/package/python-markupsafe/python-markupsafe.hash
> > @@ -1,4 +1,5 @@
> > -# md5 from https://pypi.python.org/pypi/markupsafe/json, sha256 locally computed
> > -md5 43fd756864fe42063068e092e220c57b MarkupSafe-1.1.1.tar.gz
> > -sha256 29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b MarkupSafe-1.1.1.tar.gz
> > -sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst
> > +# md5, sha256 from https://pypi.org/pypi/markupsafe/json
> > +md5 892e0fefa3c488387e5cc0cad2daa523 MarkupSafe-2.0.1.tar.gz
> > +sha256 594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a MarkupSafe-2.0.1.tar.gz
> > +# Locally computed sha256 checksums
> > +sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst
> > diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk
> > index f067d94f34..14a8d06dfe 100644
> > --- a/package/python-markupsafe/python-markupsafe.mk
> > +++ b/package/python-markupsafe/python-markupsafe.mk
> > @@ -4,13 +4,14 @@
> > #
> > ################################################################################
> >
> > -# Please keep in sync with package/python3-markupsafe/python3-markupsafe.mk
> > -PYTHON_MARKUPSAFE_VERSION = 1.1.1
> > +PYTHON_MARKUPSAFE_VERSION = 2.0.1
> > 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_LICENSE = BSD-3-Clause
> > PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst
> >
> > +HOST_PYTHON_MARKUPSAFE_NEEDS_HOST_PYTHON = python3
>
> Yes, like this :-)
>
> > +
> > $(eval $(python-package))
> > $(eval $(host-python-package))
> > diff --git a/package/python-wtforms/Config.in b/package/python-wtforms/Config.in
> > index 33a17d3d37..0cc136fc13 100644
> > --- a/package/python-wtforms/Config.in
> > +++ b/package/python-wtforms/Config.in
> > @@ -1,5 +1,6 @@
> > config BR2_PACKAGE_PYTHON_WTFORMS
> > bool "python-wtforms"
> > + depends on BR2_PACKAGE_PYTHON3
> > select BR2_PACKAGE_PYTHON_MARKUPSAFE # runtime
> > help
> > A flexible forms validation and rendering library for
> > diff --git a/package/python3-jinja2/python3-jinja2.mk b/package/python3-jinja2/python3-jinja2.mk
> > index 5d29e1d889..41081db04a 100644
> > --- a/package/python3-jinja2/python3-jinja2.mk
> > +++ b/package/python3-jinja2/python3-jinja2.mk
> > @@ -15,6 +15,6 @@ 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
> > +HOST_PYTHON3_JINJA2_DEPENDENCIES = host-python-markupsafe
>
> Since python-jinja2 became python3-only, this package can be removed entirely.
Which I did here:
https://patchwork.ozlabs.org/project/buildroot/patch/20211007193121.3775311-2-james.hilliard1@gmail.com/
Should I not be splitting up changes like this in a series?
I tried to keep most of the python-jinja2 changes in the second patch, it was
intended that they be reviewed/applied at the same time.
>
>
> Regards,
> Arnout
>
>
> >
> > $(eval $(host-python-package))
> > diff --git a/package/python3-markupsafe/python3-markupsafe.hash b/package/python3-markupsafe/python3-markupsafe.hash
> > deleted file mode 120000
> > index 947cfa12d7..0000000000
> > --- a/package/python3-markupsafe/python3-markupsafe.hash
> > +++ /dev/null
> > @@ -1 +0,0 @@
> > -../python-markupsafe/python-markupsafe.hash
> > \ No newline at end of file
> > diff --git a/package/python3-markupsafe/python3-markupsafe.mk b/package/python3-markupsafe/python3-markupsafe.mk
> > deleted file mode 100644
> > index 58f6e67b64..0000000000
> > --- a/package/python3-markupsafe/python3-markupsafe.mk
> > +++ /dev/null
> > @@ -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))
> >
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-14 21:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-07 19:31 [Buildroot] [PATCH 1/2] package/python-markupsafe: bump to version 2.0.1 James Hilliard
2021-10-07 19:31 ` [Buildroot] [PATCH 2/2] package/python-jinja2: bump to version 3.0.2 James Hilliard
2021-10-14 20:37 ` [Buildroot] [PATCH 1/2] package/python-markupsafe: bump to version 2.0.1 Arnout Vandecappelle
2021-10-14 21:00 ` James Hilliard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.