Subject: [PATCH v2 1/6] main/py3-jinja2: upgrade to 3.0.0

From: Drew DeVault <[email-masked]>
Date: Mon, 17 May 2021 06:33:27 -0400

The test failures are deprecation-related and should be resolved in
3.0.1.
---
 main/py3-jinja2/APKBUILD | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/main/py3-jinja2/APKBUILD b/main/py3-jinja2/APKBUILD
index b3932c30c5..a09a6b8fe7 100644
--- a/main/py3-jinja2/APKBUILD
+++ b/main/py3-jinja2/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Matt Smith <[email-masked]>
 pkgname=py3-jinja2
 _pkgname=Jinja2
-pkgver=2.11.3
-pkgrel=1
+pkgver=3.0.0
+pkgrel=0
 pkgdesc="A small but fast and easy to use stand-alone python template engine"
 url="https://palletsprojects.com/p/jinja/"
 arch="noarch"
@@ -11,9 +11,10 @@ license="BSD-3-Clause"
 depends="py3-markupsafe"
 checkdepends="py3-pytest"
 makedepends="python3-dev py3-setuptools"
-subpackages="$pkgname-doc $pkgname-vim"
+subpackages="$pkgname-doc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
+options="!check" # Remove for 3.0.1
 
 # secfixes:
 #   1.11.3-r0:
@@ -44,13 +45,6 @@ package() {
 	install -m 644 -D LICENSE.rst "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.rst
 }
 
-vim() {
-	pkgdesc="Vim syntax for Jinja2"
-	depends="vim"
-	install_if="$pkgname=$pkgver-r$pkgrel vim"
-
-	install -m 644 -D "$builddir"/ext/Vim/jinja.vim \
-		"$subpkgdir"/usr/share/vim/vimfiles/syntax/jinja.vim
-}
-
-sha512sums="fce4f835795fe9afb622f8106f60344032a811f3f693806f31ba482f9b7c1400f93dfa1701b4db0b472cbed4b0793cb329778c8091811ef0e3b577150d28e004  Jinja2-2.11.3.tar.gz"
+sha512sums="
+de07884ba520abbd6acd2f0edb324de1c3c3652eb8caf05c4e9d037f47a1cd87063f605b615dca5dc70edcd31ff7eee20a195363980d7a91759085440982bbdd  Jinja2-3.0.0.tar.gz
+"
-- 
2.31.1

---

From: Drew DeVault <[email-masked]>
Date: Mon, 17 May 2021 06:33:28 -0400

---
 main/py3-markupsafe/APKBUILD | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/main/py3-markupsafe/APKBUILD b/main/py3-markupsafe/APKBUILD
index 51af91c0cb..edc0139067 100644
--- a/main/py3-markupsafe/APKBUILD
+++ b/main/py3-markupsafe/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Fabian Affolter <[email-masked]>
 pkgname=py3-markupsafe
 _pkgname=MarkupSafe
-pkgver=1.1.1
-pkgrel=4
+pkgver=2.0.0
+pkgrel=0
 pkgdesc="Implements a XML/HTML/XHTML Markup safe string"
 url="https://github.com/mitsuhiko/markupsafe"
 arch="all"
@@ -29,4 +29,6 @@ package() {
 	find "$pkgdir" -name "*.c" -delete
 }
 
-sha512sums="f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6  MarkupSafe-1.1.1.tar.gz"
+sha512sums="
+260121db97178d5903645c9d1fd38c5d7c7a5bcd31a8def1d5a921328ff86ad025bf62d73734434a7920a00024ff8c0898352f7406713af51051e750b5df7cab  MarkupSafe-2.0.0.tar.gz
+"
-- 
2.31.1

---

From: Drew DeVault <[email-masked]>
Date: Mon, 17 May 2021 06:33:29 -0400

---
 community/py3-click/APKBUILD | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/community/py3-click/APKBUILD b/community/py3-click/APKBUILD
index 9981b57ff9..9fd45f7720 100644
--- a/community/py3-click/APKBUILD
+++ b/community/py3-click/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Fabian Affolter <[email-masked]>
 # Maintainer: Fabian Affolter <[email-masked]>
 pkgname=py3-click
-pkgver=7.1.2
-pkgrel=1
+pkgver=8.0.0
+pkgrel=0
 pkgdesc="Simple wrapper around optparse for powerful command line utilities"
 url="https://click.palletsprojects.com"
 arch="noarch"
@@ -28,4 +28,6 @@ package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="b9fba8a30f57e380a2005b45c4f37074a27637ace9e16fb0fb0cce88aac72cfa806eea2829dac665fe2b558b8753a40b811dbfcca94dfccf999ad494865d7888  click-7.1.2.tar.gz"
+sha512sums="
+9476b2ca7eda5c80963cdf8bf159cf94a28bf70e565b2bb6a490e8591fc76e931e2ff1294171f9344caf390ef6312ff06c5dfed83c0700e4b8eec9a060e039dd  click-8.0.0.tar.gz
+"
-- 
2.31.1

---

From: Drew DeVault <[email-masked]>
Date: Mon, 17 May 2021 06:33:32 -0400

The test failure is deprecation-related and should be addressed in
2.0.1.
---
 community/py3-flask/APKBUILD | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/community/py3-flask/APKBUILD b/community/py3-flask/APKBUILD
index d3ab8a50e5..41f6bfaa8e 100644
--- a/community/py3-flask/APKBUILD
+++ b/community/py3-flask/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Drew DeVault <[email-masked]>
 pkgname=py3-flask
 _pkgname=Flask
-pkgver=1.1.2
-pkgrel=3
+pkgver=2.0.0
+pkgrel=0
 pkgdesc="web development microframework"
 url="http://flask.pocoo.org/"
 arch="noarch"
@@ -13,6 +13,7 @@ makedepends="py3-setuptools"
 checkdepends="py3-pytest py3-pluggy"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
+options="!check" # Remove in 2.0.1
 
 replaces="py-flask" # Backwards compatibility
 provides="py-flask=$pkgver-r$pkgrel" # Backwards compatibility
@@ -29,4 +30,6 @@ package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="9feb6a9a8f34fadbea508d465f73c24b1d81b3f66243804dc3904d198c2fd78e2e1bef94df6a4940a7eec6b9b54abea06557a87de8b27b0a9497d18b3e071384  Flask-1.1.2.tar.gz"
+sha512sums="
+3fc66aa1568f7dce67bb70b0113401b7535dda32e33ac784a42f08fa21e08b055214218fac06dc6fb4b8f975b2a91321a6c97203f6568efc6bfbbb8d4ef9ddc3  Flask-2.0.0.tar.gz
+"
-- 
2.31.1

---

From: Drew DeVault <[email-masked]>
Date: Mon, 17 May 2021 06:33:31 -0400

---
 community/py3-werkzeug/APKBUILD | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/community/py3-werkzeug/APKBUILD b/community/py3-werkzeug/APKBUILD
index 7bdbed40a4..f979b911fa 100644
--- a/community/py3-werkzeug/APKBUILD
+++ b/community/py3-werkzeug/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: prspkt <[email-masked]>
 pkgname=py3-werkzeug
 _pkgname=Werkzeug
-pkgver=1.0.1
-pkgrel=2
+pkgver=2.0.0
+pkgrel=0
 pkgdesc="The WSGI swiss-army knife"
 options="!check" # Tests fail with newer py3-packaging
 url="https://werkzeug.palletsprojects.com/"
@@ -30,4 +30,6 @@ check() {
 	PYTHONPATH=$PWD/build/lib pytest --ignore="$fail"
 }
 
-sha512sums="ba76ee6f39cf8f6b2c8988e6119be78cc6c868ea78bd2014837b4e9f59e8b790fb3a7b5a45b392cabdc61f32b8a6902cf5f43d7e20b1f4571e0bef102a3e88fa  Werkzeug-1.0.1.tar.gz"
+sha512sums="
+b7631f6d73562528a9fcd3d268f32990ffdcbaf281076119905127bb799d364311ee9e657e2cf765936239225387703c0452c0b3e436552baeea6e4fe3efe598  Werkzeug-2.0.0.tar.gz
+"
-- 
2.31.1