From 83b097cc3b9ed4a45cb8b1fb3b3ef8a09f32ea48 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Mon, 25 Dec 2017 13:25:13 -0500 Subject: python-flask-wtf: update to version 0.14.2 Signed-off-by: Derek Straka Signed-off-by: Armin Kuster --- .../recipes-devtools/python/python-flask-wtf.inc | 13 +++++----- .../import-simplejson-as-json.patch | 28 ---------------------- .../python/python-flask-wtf_0.12.bb | 2 -- .../python/python-flask-wtf_0.14.2.bb | 2 ++ .../python/python3-flask-wtf_0.12.bb | 2 -- .../python/python3-flask-wtf_0.14.2.bb | 2 ++ 6 files changed, 10 insertions(+), 39 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python-flask-wtf/import-simplejson-as-json.patch delete mode 100644 meta-python/recipes-devtools/python/python-flask-wtf_0.12.bb create mode 100644 meta-python/recipes-devtools/python/python-flask-wtf_0.14.2.bb delete mode 100644 meta-python/recipes-devtools/python/python3-flask-wtf_0.12.bb create mode 100644 meta-python/recipes-devtools/python/python3-flask-wtf_0.14.2.bb (limited to 'meta-python/recipes-devtools') diff --git a/meta-python/recipes-devtools/python/python-flask-wtf.inc b/meta-python/recipes-devtools/python/python-flask-wtf.inc index 3a959aed73..3c90656ad7 100644 --- a/meta-python/recipes-devtools/python/python-flask-wtf.inc +++ b/meta-python/recipes-devtools/python/python-flask-wtf.inc @@ -1,16 +1,15 @@ DESCRIPTION = "Simple integration of Flask and WTForms." LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=507e8635f25a06dc4f041a3a1b3359b3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3ca6bb31670492f791e6a9f2fb9f8a80" -SRC_URI[md5sum] = "c53a74e8ba481bf53405fd5efdf0339e" -SRC_URI[sha256sum] = "bd99316c97ed1d1cb90b8f0c242c86420a891a6a2058f20717e424bf5b0bb80e" - -FILESEXTRAPATHS_prepend := "${THISDIR}/python-flask-wtf:" -SRC_URI += " file://import-simplejson-as-json.patch" +SRC_URI[md5sum] = "586f50f233926cade42e3d744aca3e8f" +SRC_URI[sha256sum] = "5d14d55cfd35f613d99ee7cba0fc3fbbe63ba02f544d349158c14ca15561cc36" PYPI_PACKAGE = "Flask-WTF" RDEPENDS_${PN} = "\ + ${PYTHON_PN}-flask \ + ${PYTHON_PN}-itsdangerous \ + ${PYTHON_PN}-json \ ${PYTHON_PN}-wtforms \ - ${PYTHON_PN}-simplejson \ " diff --git a/meta-python/recipes-devtools/python/python-flask-wtf/import-simplejson-as-json.patch b/meta-python/recipes-devtools/python/python-flask-wtf/import-simplejson-as-json.patch deleted file mode 100644 index 678f7062b7..0000000000 --- a/meta-python/recipes-devtools/python/python-flask-wtf/import-simplejson-as-json.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Subject: [PATCH] import simplejson as json - -At runtime python-Flask-WTF tries to import json, but the module is not -available, import simplejson as json solve the issue. - -Signed-off-by: Fabio Berton ---- - flask_wtf/recaptcha/validators.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/flask_wtf/recaptcha/validators.py b/flask_wtf/recaptcha/validators.py -index bcff23d..4a244bb 100644 ---- a/flask_wtf/recaptcha/validators.py -+++ b/flask_wtf/recaptcha/validators.py -@@ -8,7 +8,7 @@ from flask import request, current_app - from wtforms import ValidationError - from werkzeug import url_encode - from .._compat import to_bytes, to_unicode --import json -+import simplejson as json - - RECAPTCHA_VERIFY_SERVER = 'https://www.google.com/recaptcha/api/siteverify' - RECAPTCHA_ERROR_CODES = { --- -2.1.4 - diff --git a/meta-python/recipes-devtools/python/python-flask-wtf_0.12.bb b/meta-python/recipes-devtools/python/python-flask-wtf_0.12.bb deleted file mode 100644 index dbf091bc0f..0000000000 --- a/meta-python/recipes-devtools/python/python-flask-wtf_0.12.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools -require python-flask-wtf.inc diff --git a/meta-python/recipes-devtools/python/python-flask-wtf_0.14.2.bb b/meta-python/recipes-devtools/python/python-flask-wtf_0.14.2.bb new file mode 100644 index 0000000000..dbf091bc0f --- /dev/null +++ b/meta-python/recipes-devtools/python/python-flask-wtf_0.14.2.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools +require python-flask-wtf.inc diff --git a/meta-python/recipes-devtools/python/python3-flask-wtf_0.12.bb b/meta-python/recipes-devtools/python/python3-flask-wtf_0.12.bb deleted file mode 100644 index 52362a8659..0000000000 --- a/meta-python/recipes-devtools/python/python3-flask-wtf_0.12.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit pypi setuptools3 -require python-flask-wtf.inc diff --git a/meta-python/recipes-devtools/python/python3-flask-wtf_0.14.2.bb b/meta-python/recipes-devtools/python/python3-flask-wtf_0.14.2.bb new file mode 100644 index 0000000000..52362a8659 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-flask-wtf_0.14.2.bb @@ -0,0 +1,2 @@ +inherit pypi setuptools3 +require python-flask-wtf.inc -- cgit 1.2.3-korg