From 9b07de55dfe6d50baeda3a8feda7f9fcade9c647 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 26 Dec 2019 22:15:25 -0600
Subject: user/py3*: modernise, fix syntax

---
 user/py3-cparser/APKBUILD                       | 3 ---
 user/py3-cryptography/APKBUILD                  | 9 +++++++--
 user/py3-idna/APKBUILD                          | 4 ----
 user/py3-imagesize/APKBUILD                     | 3 ---
 user/py3-pretend/APKBUILD                       | 5 +----
 user/py3-requests/APKBUILD                      | 1 -
 user/py3-sphinx/APKBUILD                        | 2 +-
 user/py3-sphinxcontrib-applehelp/APKBUILD       | 5 +----
 user/py3-sphinxcontrib-asyncio/APKBUILD         | 1 -
 user/py3-sphinxcontrib-devhelp/APKBUILD         | 5 +----
 user/py3-sphinxcontrib-htmlhelp/APKBUILD        | 2 +-
 user/py3-sphinxcontrib-jsmath/APKBUILD          | 5 +----
 user/py3-sphinxcontrib-qthelp/APKBUILD          | 5 +----
 user/py3-sphinxcontrib-serializinghtml/APKBUILD | 5 +----
 user/py3-urllib3/APKBUILD                       | 1 -
 15 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/user/py3-cparser/APKBUILD b/user/py3-cparser/APKBUILD
index d08071bf2..4f076a744 100644
--- a/user/py3-cparser/APKBUILD
+++ b/user/py3-cparser/APKBUILD
@@ -14,17 +14,14 @@ source="py3-cparser-$pkgver.tar.gz::https://github.com/eliben/pycparser/archive/
 builddir="$srcdir/pycparser-release_v$pkgver"
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 }
 
 check() {
-	cd "$builddir"
 	python3 tests/all_tests.py
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
diff --git a/user/py3-cryptography/APKBUILD b/user/py3-cryptography/APKBUILD
index 3aef0a2b6..a2f3c0091 100644
--- a/user/py3-cryptography/APKBUILD
+++ b/user/py3-cryptography/APKBUILD
@@ -10,9 +10,11 @@ pkgrel=0
 pkgdesc="A package which provides cryptographic recipes and primitives"
 url="https://pypi.org/project/cryptography"
 arch="all"
-options="!check" # tests want hypothesis; deep rabbit hole
+options="!check"  # See checkdepends comment below.
 license="Apache-2.0 OR BSD-3-Clause"
 depends="python3 py3-cffi py3-asn1crypto py3-six"
+# requires unpackaged py3-cryptography_vectors which makes no sense to package
+#checkdepends="py3-attrs py3-hypothesis py3-pretend py3-pytest py3-tz"
 makedepends="python3-dev libffi-dev openssl-dev"
 subpackages=""
 source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
@@ -22,8 +24,11 @@ build() {
 	python3 setup.py build
 }
 
+check() {
+	python3 setup.py test
+}
+
 package() {
-	mkdir -p "$pkgdir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
diff --git a/user/py3-idna/APKBUILD b/user/py3-idna/APKBUILD
index ea624e5fc..2dcf01370 100644
--- a/user/py3-idna/APKBUILD
+++ b/user/py3-idna/APKBUILD
@@ -17,18 +17,14 @@ source="idna-$pkgver.tar.gz::https://github.com/kjd/idna/archive/v$pkgver.tar.gz
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 }
 
 check() {
-	cd "$builddir"
 	python3 setup.py test
 }
 
 package() {
-	mkdir -p "$pkgdir"
-	cd "$builddir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
diff --git a/user/py3-imagesize/APKBUILD b/user/py3-imagesize/APKBUILD
index 8b2dad108..1403a702b 100644
--- a/user/py3-imagesize/APKBUILD
+++ b/user/py3-imagesize/APKBUILD
@@ -17,17 +17,14 @@ source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 }
 
 check() {
-	cd "$builddir"
 	python3 setup.py test
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 
 }
diff --git a/user/py3-pretend/APKBUILD b/user/py3-pretend/APKBUILD
index 87ba1cdf6..5a7b8e175 100644
--- a/user/py3-pretend/APKBUILD
+++ b/user/py3-pretend/APKBUILD
@@ -12,23 +12,20 @@ arch="noarch"
 options="!check" # Test script missing from tarball
 license="BSD-3-Clause"
 depends="python3"
-makedepends="python3-dev"
 checkdepends="py3-pytest"
+makedepends="python3-dev"
 source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 }
 
 check() {
-	cd "$builddir"
 	python3 test_pretend.py
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 
 }
diff --git a/user/py3-requests/APKBUILD b/user/py3-requests/APKBUILD
index a82061ee2..f5b4d4c8f 100644
--- a/user/py3-requests/APKBUILD
+++ b/user/py3-requests/APKBUILD
@@ -24,7 +24,6 @@ build() {
 }
 
 package() {
-	mkdir -p "$pkgdir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
diff --git a/user/py3-sphinx/APKBUILD b/user/py3-sphinx/APKBUILD
index df79f3b9b..d42d67825 100644
--- a/user/py3-sphinx/APKBUILD
+++ b/user/py3-sphinx/APKBUILD
@@ -13,8 +13,8 @@ options="!check" # Some latex tests failing on 2.0.0 due to translation bug, see
 # Main software is BSD-2-Clause.
 license="BSD-2-Clause AND BSD-3-Clause AND MIT"
 depends="python3 py3-alabaster py3-babel py3-pygments py3-docutils py3-imagesize py3-jinja2 py3-packaging py3-pyparsing py3-requests py3-snowballstemmer py3-tz py3-sphinxcontrib-applehelp py3-sphinxcontrib-devhelp py3-sphinxcontrib-htmlhelp py3-sphinxcontrib-jsmath py3-sphinxcontrib-qthelp py3-sphinxcontrib-serializinghtml imagemagick"
-makedepends="python3-dev"
 checkdepends="py3-pytest py3-docutils py3-html5lib"
+makedepends="python3-dev"
 source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
diff --git a/user/py3-sphinxcontrib-applehelp/APKBUILD b/user/py3-sphinxcontrib-applehelp/APKBUILD
index 26010c36a..eebdeb272 100644
--- a/user/py3-sphinxcontrib-applehelp/APKBUILD
+++ b/user/py3-sphinxcontrib-applehelp/APKBUILD
@@ -12,23 +12,20 @@ arch="noarch"
 options="!check" # Cyclic dependency with sphinx
 license="BSD-2-Clause"
 depends="python3"
-makedepends="python3-dev"
 checkdepends="py3-sphinx py3-pytest"
+makedepends="python3-dev"
 source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 }
 
 check() {
-	cd "$builddir"
 	PYTHONWARNINGS="all,ignore::DeprecationWarning:docutils.io" pytest --durations 25
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 
 }
diff --git a/user/py3-sphinxcontrib-asyncio/APKBUILD b/user/py3-sphinxcontrib-asyncio/APKBUILD
index 09f91c27b..8723f312c 100644
--- a/user/py3-sphinxcontrib-asyncio/APKBUILD
+++ b/user/py3-sphinxcontrib-asyncio/APKBUILD
@@ -27,7 +27,6 @@ check() {
 }
 
 package() {
-	mkdir -p "$pkgdir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
diff --git a/user/py3-sphinxcontrib-devhelp/APKBUILD b/user/py3-sphinxcontrib-devhelp/APKBUILD
index 5b25ff13c..474ec4928 100644
--- a/user/py3-sphinxcontrib-devhelp/APKBUILD
+++ b/user/py3-sphinxcontrib-devhelp/APKBUILD
@@ -12,23 +12,20 @@ arch="noarch"
 options="!check" # Cyclic dependency with sphinx
 license="BSD-2-Clause"
 depends="python3"
-makedepends="python3-dev"
 checkdepends="py3-sphinx py3-pytest"
+makedepends="python3-dev"
 source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 }
 
 check() {
-	cd "$builddir"
 	PYTHONWARNINGS="all,ignore::DeprecationWarning:docutils.io" pytest --durations 25
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 
 }
diff --git a/user/py3-sphinxcontrib-htmlhelp/APKBUILD b/user/py3-sphinxcontrib-htmlhelp/APKBUILD
index 09de4ddf6..abfc54ec8 100644
--- a/user/py3-sphinxcontrib-htmlhelp/APKBUILD
+++ b/user/py3-sphinxcontrib-htmlhelp/APKBUILD
@@ -12,8 +12,8 @@ arch="noarch"
 options="!check" # Cyclic dependency with sphinx
 license="BSD-2-Clause"
 depends="python3"
-makedepends="python3-dev"
 checkdepends="py3-sphinx py3-pytest py3-html5lib"
+makedepends="python3-dev"
 source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
diff --git a/user/py3-sphinxcontrib-jsmath/APKBUILD b/user/py3-sphinxcontrib-jsmath/APKBUILD
index 9443b5d25..c8c8d5f25 100644
--- a/user/py3-sphinxcontrib-jsmath/APKBUILD
+++ b/user/py3-sphinxcontrib-jsmath/APKBUILD
@@ -12,23 +12,20 @@ arch="noarch"
 options="!check" # Cyclic dependency on sphinx
 license="BSD-2-Clause"
 depends="python3"
-makedepends="python3-dev"
 checkdepends="py3-sphinx py3-pytest"
+makedepends="python3-dev"
 source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 }
 
 check() {
-	cd "$builddir"
 	PYTHONWARNINGS="all,ignore::DeprecationWarning:docutils.io" pytest --durations 25
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 
 }
diff --git a/user/py3-sphinxcontrib-qthelp/APKBUILD b/user/py3-sphinxcontrib-qthelp/APKBUILD
index fb32bad02..3740f30ff 100644
--- a/user/py3-sphinxcontrib-qthelp/APKBUILD
+++ b/user/py3-sphinxcontrib-qthelp/APKBUILD
@@ -12,23 +12,20 @@ arch="noarch"
 options="!check" # Cyclic dependency with sphinx
 license="BSD-2-Clause"
 depends="python3"
-makedepends="python3-dev"
 checkdepends="py3-sphinx py3-pytest"
+makedepends="python3-dev"
 source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 }
 
 check() {
-	cd "$builddir"
 	PYTHONWARNINGS="all,ignore::DeprecationWarning:docutils.io" pytest --durations 25
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 
 }
diff --git a/user/py3-sphinxcontrib-serializinghtml/APKBUILD b/user/py3-sphinxcontrib-serializinghtml/APKBUILD
index b18e17848..35b6bc979 100644
--- a/user/py3-sphinxcontrib-serializinghtml/APKBUILD
+++ b/user/py3-sphinxcontrib-serializinghtml/APKBUILD
@@ -12,23 +12,20 @@ arch="noarch"
 options="!check" # Cyclic dependency with sphinx
 license="BSD-2-Clause"
 depends="python3 py3-markupsafe"
-makedepends="python3-dev"
 checkdepends="py3-sphinx py3-pytest"
+makedepends="python3-dev"
 source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 }
 
 check() {
-	cd "$builddir"
 	PYTHONWARNINGS="all,ignore::DeprecationWarning:docutils.io" pytest --durations 25
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 
 }
diff --git a/user/py3-urllib3/APKBUILD b/user/py3-urllib3/APKBUILD
index bde1340a1..23b590532 100644
--- a/user/py3-urllib3/APKBUILD
+++ b/user/py3-urllib3/APKBUILD
@@ -22,7 +22,6 @@ build() {
 }
 
 package() {
-	mkdir -p "$pkgdir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-- 
cgit v1.2.3-60-g2f50