*/*: remove pointless python optimise

this doesn't really "optimise" the python or do much to improve
performance.

it's identical to running python with -O or setting PYTHONOPTIMISE= in
the environment.

doing it here just doubles the disk space for the pre-cached files
generated by python on startup with optimisations

30 files changed, 106 insertions, 93 deletions

diff --git a/community/onboard/APKBUILD b/community/onboard/APKBUILD
index f2b3daae896..f5e3fd480a2 100644
--- a/community/onboard/APKBUILD
+++ b/community/onboard/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Danct12 <danct12@disroot.org>
 pkgname=onboard
 pkgver=1.4.1
-pkgrel=7
+pkgrel=8
 pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users"
 url="https://launchpad.net/onboard"
 license="GPL-3.0-only"
@@ -22,8 +22,10 @@ build() {
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 setup.py install --skip-build --root="$pkgdir"
 }
 
-sha512sums="ed75c1dce893e3420ecf532faffb15efc9fba56cf6622b03fe5e1cebb88d32304636b0268e4b8b75dc0eb6d7bfc8602c4a93a90bdeb8cd960d3447d16acc7463  onboard-1.4.1.tar.gz
-23742c38f877fc31260d4d7d3ff38c8d72541a77e099183d6633de74bcb223bbd34cedd88016f043867b2571f1196b59a3378a94186b468dbaa7a5d00661065a  glibc-musl-error.patch"
+sha512sums="
+ed75c1dce893e3420ecf532faffb15efc9fba56cf6622b03fe5e1cebb88d32304636b0268e4b8b75dc0eb6d7bfc8602c4a93a90bdeb8cd960d3447d16acc7463  onboard-1.4.1.tar.gz
+23742c38f877fc31260d4d7d3ff38c8d72541a77e099183d6633de74bcb223bbd34cedd88016f043867b2571f1196b59a3378a94186b468dbaa7a5d00661065a  glibc-musl-error.patch
+"
diff --git a/community/pdfposter/APKBUILD b/community/pdfposter/APKBUILD
index 313aa6008aa..866e07e3c24 100644
--- a/community/pdfposter/APKBUILD
+++ b/community/pdfposter/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Aiden Grossman <agrossman154@yahoo.com>
 pkgname=pdfposter
 pkgver=0.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Tool for scaling and tiling PDFs to multiple pages for printing"
 url="https://gitlab.com/pdftools/pdfposter/"
 arch="noarch"
@@ -22,8 +22,9 @@ check() {
 }
 
 package() {
-	python3 setup.py install --skip-build --root="$pkgdir" --optimize=1
+	python3 setup.py install --skip-build --root="$pkgdir"
 }
+
 sha512sums="
 a457b966ccc1239ed4a1aa06ef7d11d40e2499321e1ad51269f7bb00ff51ed8db3fd27a79fbb3051450044a81aa44c793606fb431664eef707fd0d4251de3ac9  pdfposter-v0.8.1.tar.gz
 "
diff --git a/community/py3-affine/APKBUILD b/community/py3-affine/APKBUILD
index 36e9c4360a8..75a2280bb67 100644
--- a/community/py3-affine/APKBUILD
+++ b/community/py3-affine/APKBUILD
@@ -3,7 +3,7 @@
 _pkgname=affine
 pkgname=py3-$_pkgname
 pkgver=2.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Affine transformation matrices"
 url="https://pypi.org/project/affine/"
 arch="noarch"
@@ -23,7 +23,7 @@ check() {
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=2
+	python3 setup.py install --skip-build --root="$pkgdir"
 	rm -rf "$pkgdir"/usr/lib/python3*/site-packages/*/tests
 }
 
diff --git a/community/py3-aiohttp1/APKBUILD b/community/py3-aiohttp1/APKBUILD
index 918aa3d86a0..7551fb3f585 100644
--- a/community/py3-aiohttp1/APKBUILD
+++ b/community/py3-aiohttp1/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py3-aiohttp1
 _pkgname=aiohttp
 pkgver=1.3.5
-pkgrel=5
+pkgrel=6
 pkgdesc="HTTP client/server for asyncio - 1.x version"
 url="https://pypi.python.org/pypi/aiohttp"
 arch="all"
@@ -23,8 +23,10 @@ build() {
 }
 
 package() {
-	python3 setup.py install --root="$pkgdir" --optimize=1
+	python3 setup.py install --root="$pkgdir"
 }
 
-sha512sums="5315d8c77d6886486274fb8f2e3f10cb8f97050b097560e5b1cfd51b4d094dc45281cad894ea51079c6b7054f396d46b89f4c471835d1b058dcc90faaf01eaa4  py3-aiohttp1-1.3.5.tar.gz
-29e8172c2038b2900e82de0eb5b47f3265b144e5ec470a1868d3453a1be2e5295c5363bac258120f49ed785d2c82ae14f185292a28847a40b44d7b071b8dd083  dropped-requirements.patch"
+sha512sums="
+5315d8c77d6886486274fb8f2e3f10cb8f97050b097560e5b1cfd51b4d094dc45281cad894ea51079c6b7054f396d46b89f4c471835d1b058dcc90faaf01eaa4  py3-aiohttp1-1.3.5.tar.gz
+29e8172c2038b2900e82de0eb5b47f3265b144e5ec470a1868d3453a1be2e5295c5363bac258120f49ed785d2c82ae14f185292a28847a40b44d7b071b8dd083  dropped-requirements.patch
+"
diff --git a/community/py3-argcomplete/APKBUILD b/community/py3-argcomplete/APKBUILD
index c35256481cd..a15659374e5 100644
--- a/community/py3-argcomplete/APKBUILD
+++ b/community/py3-argcomplete/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py3-argcomplete
 _pyname=argcomplete
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Easy, extensible command line tab completion of arguments for your Python script"
 options="!check" # Tests are py2 dependent
 url="https://github.com/kislyuk/argcomplete"
@@ -28,7 +28,7 @@ check() {
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 setup.py install --skip-build --root="$pkgdir"
 }
 
 sha512sums="
diff --git a/community/py3-click-plugins/APKBUILD b/community/py3-click-plugins/APKBUILD
index 5955a45bca8..30b8f3e2b91 100644
--- a/community/py3-click-plugins/APKBUILD
+++ b/community/py3-click-plugins/APKBUILD
@@ -3,7 +3,7 @@
 _pkgname=click-plugins
 pkgname=py3-$_pkgname
 pkgver=1.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="An extension module for click to enable registering CLI commands via setuptools entry-points"
 url="https://pypi.org/project/click-plugins/"
 arch="noarch"
@@ -32,7 +32,9 @@ check() {
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=2
+	python3 setup.py install --skip-build --root="$pkgdir"
 }
 
-sha512sums="a1735f493aad45b328e3156b239376be89ae8bc9d1cd349355496352157672b6642429e0fe7e364c0e971c5f347263cfb6481f413185ad869173c2777679a37e  py3-click-plugins-1.1.1.tar.gz"
+sha512sums="
+a1735f493aad45b328e3156b239376be89ae8bc9d1cd349355496352157672b6642429e0fe7e364c0e971c5f347263cfb6481f413185ad869173c2777679a37e  py3-click-plugins-1.1.1.tar.gz
+"
diff --git a/community/py3-cligj/APKBUILD b/community/py3-cligj/APKBUILD
index d04fe7f5760..b3d3f4e6adc 100644
--- a/community/py3-cligj/APKBUILD
+++ b/community/py3-cligj/APKBUILD
@@ -3,7 +3,7 @@
 _pkgname=cligj
 pkgname=py3-$_pkgname
 pkgver=0.7.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Common arguments and options for GeoJSON processing commands, using Click"
 url="https://pypi.org/project/cligj/"
 arch="noarch"
@@ -32,7 +32,7 @@ check() {
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=2
+	python3 setup.py install --skip-build --root="$pkgdir"
 }
 
 sha512sums="
diff --git a/community/py3-crcmod/APKBUILD b/community/py3-crcmod/APKBUILD
index b3e063dae8c..b3808bf2be2 100644
--- a/community/py3-crcmod/APKBUILD
+++ b/community/py3-crcmod/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py3-crcmod
 _pkgname=crcmod
 pkgver=1.7
-pkgrel=7
+pkgrel=8
 pkgdesc="Cyclic Redundancy Check (CRC) implementation in Python"
 url="https://pypi.python.org/pypi/crcmod/"
 arch="all"
@@ -26,7 +26,9 @@ check() {
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 setup.py install --skip-build --root="$pkgdir"
 }
 
-sha512sums="3c2f65004761c84f19d6ba95a0af74512108bad5007d9e20f8e684822e4196ce17073e58b47d2fa997e058e3d82782f3393458b6f0e86935418f38877d319a31  crcmod-1.7.tar.gz"
+sha512sums="
+3c2f65004761c84f19d6ba95a0af74512108bad5007d9e20f8e684822e4196ce17073e58b47d2fa997e058e3d82782f3393458b6f0e86935418f38877d319a31  crcmod-1.7.tar.gz
+"
diff --git a/community/py3-ifaddr/APKBUILD b/community/py3-ifaddr/APKBUILD
index 645f202bd81..9cac460da70 100644
--- a/community/py3-ifaddr/APKBUILD
+++ b/community/py3-ifaddr/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: David Florness <david@florness.com>
 pkgname=py3-ifaddr
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Enumerates all IP addresses on all network adapters of the system"
 url="https://github.com/pydron/ifaddr"
 arch="noarch"
@@ -22,7 +22,7 @@ check() {
 }
 
 package() {
-	python3 setup.py install --root="$pkgdir" --prefix="/usr" --optimize=1
+	python3 setup.py install --root="$pkgdir" --skip-build
 }
 
 sha512sums="
diff --git a/community/py3-rasterio/APKBUILD b/community/py3-rasterio/APKBUILD
index ebf7d6f03ed..eac88b4d6f4 100644
--- a/community/py3-rasterio/APKBUILD
+++ b/community/py3-rasterio/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Holger Jaekel <holger.jaekel@gmx.de>
 pkgname=py3-rasterio
 pkgver=1.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast and direct raster I/O for use with Numpy and SciPy"
 url="https://pypi.python.org/pypi/rasterio"
 arch="all !riscv64" # py3-matplotlib
@@ -45,7 +45,7 @@ check() {
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=2
+	python3 setup.py install --skip-build --root="$pkgdir"
 }
 
 sha512sums="
diff --git a/community/py3-sgmllib3k/APKBUILD b/community/py3-sgmllib3k/APKBUILD
index 50fb8c64afa..6ae0ef94912 100644
--- a/community/py3-sgmllib3k/APKBUILD
+++ b/community/py3-sgmllib3k/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py3-sgmllib3k
 _pkgname=sgmllib3k
 pkgver=1.0.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Simple SGML parser"
 url="https://pypi.python.org/pypi/sgmllib3k"
 arch="noarch"
@@ -17,7 +17,9 @@ build() {
 }
 
 package() {
-	python3 setup.py install --root="$pkgdir" --optimize=1
+	python3 setup.py install --root="$pkgdir"
 }
 
-sha512sums="f9238afb831356f66b1c3e55975e0ea88007ffe1469b8b4e325e704d1915eb0ab120f5f9e98f36eeb4bf6204a1938d8a4d5a424f0cc054b141ac94adc8ef8ca9  sgmllib3k-1.0.0.tar.gz"
+sha512sums="
+f9238afb831356f66b1c3e55975e0ea88007ffe1469b8b4e325e704d1915eb0ab120f5f9e98f36eeb4bf6204a1938d8a4d5a424f0cc054b141ac94adc8ef8ca9  sgmllib3k-1.0.0.tar.gz
+"
diff --git a/community/py3-snuggs/APKBUILD b/community/py3-snuggs/APKBUILD
index 630a841eabb..64442e95a3b 100644
--- a/community/py3-snuggs/APKBUILD
+++ b/community/py3-snuggs/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py3-snuggs
 _pkgname=snuggs
 pkgver=1.4.7
-pkgrel=4
+pkgrel=5
 pkgdesc="Snuggs are s-expressions for Numpy"
 url="https://pypi.org/project/snuggs/"
 arch="noarch"
@@ -23,7 +23,9 @@ check() {
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=2
+	python3 setup.py install --skip-build --root="$pkgdir"
 }
 
-sha512sums="c1f40e521d1b0cf15075b22b04000c74ecbd0522cdd820b8c159aac812924d877349b3f3bca93b09eed5b025a34c26665a41c7a52a8145419558b115cf8ef361  snuggs-1.4.7.tar.gz"
+sha512sums="
+c1f40e521d1b0cf15075b22b04000c74ecbd0522cdd820b8c159aac812924d877349b3f3bca93b09eed5b025a34c26665a41c7a52a8145419558b115cf8ef361  snuggs-1.4.7.tar.gz
+"
diff --git a/community/py3-tornado/APKBUILD b/community/py3-tornado/APKBUILD
index e4f224c685b..d45f064b784 100644
--- a/community/py3-tornado/APKBUILD
+++ b/community/py3-tornado/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=py3-tornado
 _pkgname=tornado
 pkgver=6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Python3 web framework and asynchronous networking library"
 options="!check" # 3 Tests fail by failure to resolve 'localhost'
 url="http://www.tornadoweb.org/"
@@ -30,7 +30,7 @@ check() {
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 setup.py install --skip-build --root="$pkgdir"
 	rm -rf "$pkgdir"/usr/lib/python3*/site-packages/$_pkgname/test
 }
 
diff --git a/community/py3-websockets/APKBUILD b/community/py3-websockets/APKBUILD
index 081e9eeb7f0..72788242608 100644
--- a/community/py3-websockets/APKBUILD
+++ b/community/py3-websockets/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=py3-websockets
 _pkgname=websockets
 pkgver=10.4
-pkgrel=1
+pkgrel=2
 pkgdesc="An implementation of the WebSocket Protocol (RFC 6455)"
 options="net"
 url="https://websockets.readthedocs.io/"
@@ -26,7 +26,7 @@ check() {
 }
 
 package() {
-	python3 setup.py install --root="$pkgdir" --optimize=1
+	python3 setup.py install --root="$pkgdir"
 }
 
 sha512sums="
diff --git a/community/ranger/APKBUILD b/community/ranger/APKBUILD
index aeb80bf03fc..81065d22df0 100644
--- a/community/ranger/APKBUILD
+++ b/community/ranger/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=ranger
 pkgver=1.9.3
-pkgrel=4
+pkgrel=5
 pkgdesc="VIM-inspired filemanager for the console"
 url="https://ranger.github.io/"
 arch="noarch"
@@ -22,10 +22,12 @@ check() {
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 setup.py install --skip-build --root="$pkgdir"
 
 	install -Dm644 doc/ranger.1 "$pkgdir"/usr/share/man/man1/ranger.1
 	install -Dm644 doc/rifle.1 "$pkgdir"/usr/share/man/man1/rifle.1
 }
 
-sha512sums="5cd7bea714a6542d0a5445f5f0cf929b2df4377df3ef710f3786c6c46dd58b017a8060cde3969076637bfaac03c13297d3020fd82f4574dc49546ca223c0e8d3  ranger-1.9.3.tar.gz"
+sha512sums="
+5cd7bea714a6542d0a5445f5f0cf929b2df4377df3ef710f3786c6c46dd58b017a8060cde3969076637bfaac03c13297d3020fd82f4574dc49546ca223c0e8d3  ranger-1.9.3.tar.gz
+"
diff --git a/community/salt/APKBUILD b/community/salt/APKBUILD
index 4a47b8afbe8..426dc9709e9 100644
--- a/community/salt/APKBUILD
+++ b/community/salt/APKBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
 pkgname=salt
 pkgver=3005.1
-pkgrel=1
+pkgrel=2
 pkgdesc="parallel remote execution system"
 url="https://github.com/saltstack/salt"
 arch="noarch"
@@ -60,7 +60,7 @@ check() {
 }
 
 package() {
-	python3 setup.py install --root="$pkgdir"/ --optimize=1
+	python3 setup.py install --root="$pkgdir"
 	mkdir -p "$pkgdir"/var/log/$pkgname
 }
 
diff --git a/main/supervisor/APKBUILD b/main/supervisor/APKBUILD
index e421d07bbfd..ba5c7413f64 100644
--- a/main/supervisor/APKBUILD
+++ b/main/supervisor/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=supervisor
 pkgver=4.2.5
-pkgrel=0
+pkgrel=1
 pkgdesc="system for controlling process state under UNIX"
 url="http://supervisord.org/"
 arch="noarch"
@@ -29,7 +29,7 @@ check() {
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+	python3 setup.py install --skip-build --root="$pkgdir"
 	install -Dm600 "$srcdir/supervisord.conf" "$pkgdir/etc/supervisord.conf"
 	install -Dm755 "$srcdir/supervisord.initrd" "$pkgdir/etc/init.d/supervisord"
 	install -Dm644 "$srcdir/supervisord.logrotate" "$pkgdir/etc/logrotate.d/supervisord"
diff --git a/testing/autotrash/APKBUILD b/testing/autotrash/APKBUILD
index b9ec059d428..eabd587d2b1 100644
--- a/testing/autotrash/APKBUILD
+++ b/testing/autotrash/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Thiago Perrotta <tbperrotta@gmail.com>
 pkgname=autotrash
 pkgver=0.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Tool to automatically purge old trashed files"
 url="https://bneijt.nl/pr/autotrash/"
 arch="noarch"
@@ -16,8 +16,9 @@ build() {
 }
 
 package() {
-	python3 setup.py install --root="$pkgdir" --optimize=1 --skip-build
+	python3 setup.py install --root="$pkgdir" --skip-build
 }
+
 sha512sums="
 b39be5a5cf137dde74d104565a536ceb8208d0c900f0b900c94ae7320b5e65b788e90ffbaaa14f90810931997def2aabfe858a8a00e3b7d9252d6738c6036dc3  autotrash-0.4.4.tar.gz
 "
diff --git a/testing/azote/APKBUILD b/testing/azote/APKBUILD
index 0c4bc05a597..18843bda059 100644
--- a/testing/azote/APKBUILD
+++ b/testing/azote/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Matthew T Hoare <matthew.t.hoare@gmail.com>
 pkgname=azote
 pkgver=1.9.7
-pkgrel=0
+pkgrel=1
 pkgdesc="Wallpaper and colour manager for Sway, i3 and other window managers"
 url="https://github.com/nwg-piotr/azote"
 arch="noarch"
@@ -12,13 +12,17 @@ depends="feh gtk+3.0 py3-cairo py3-gobject3 py3-pillow py3-send2trash
 options="!check" # no checks
 source="$pkgname-$pkgver.tar.gz::https://github.com/nwg-piotr/azote/archive/v$pkgver.tar.gz"
 
+build() {
+	python3 setup.py build
+}
+
 package() {
 	install -Dm755 dist/azote "$pkgdir"/usr/bin/azote
 	install -D -t "$pkgdir"/usr/share/pixmaps dist/azote.svg
 	install -D -t "$pkgdir"/usr/share/"$pkgname" dist/indicator_active.png
 	install -D -t "$pkgdir"/usr/share/"$pkgname" dist/indicator_attention.png
 	install -D -t "$pkgdir"/usr/share/applications dist/azote.desktop
-	python3 setup.py install --root="$pkgdir/" --optimize=1
+	python3 setup.py install --root="$pkgdir" --skip-build
 }
 
 sha512sums="
diff --git a/testing/pdfarranger/APKBUILD b/testing/pdfarranger/APKBUILD
index 712b1fb10c7..798eb400363 100644
--- a/testing/pdfarranger/APKBUILD
+++ b/testing/pdfarranger/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
 pkgname=pdfarranger
 pkgver=1.9.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Helps merge or split PDF documents and rotate, crop and rearrange pages"
 url="https://github.com/pdfarranger/pdfarranger"
 arch="noarch"
@@ -19,7 +19,7 @@ build() {
 }
 
 package() {
-	python3 setup.py install --root="$pkgdir" --optimize=1
+	python3 setup.py install --root="$pkgdir"
 }
 
 sha512sums="
diff --git a/testing/py3-hbmqtt/APKBUILD b/testing/py3-hbmqtt/APKBUILD
index 99e95826e07..eba4c91c587 100644
--- a/testing/py3-hbmqtt/APKBUILD
+++ b/testing/py3-hbmqtt/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=py3-hbmqtt
 _pkgname=hbmqtt
 pkgver=0.9.6
-pkgrel=3
+pkgrel=4
 pkgdesc="MQTT client/broker using Python asynchronous I/O"
 url="https://hbmqtt.readthedocs.io/"
 arch="noarch"
@@ -15,18 +15,17 @@ builddir="$srcdir"/$_pkgname-$pkgver
 options="!check" # FIXME: disable tests to unblock builders
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 }
 
 check() {
-	cd "$builddir"
 	python3 setup.py test
 }
 
 package() {
-	cd "$builddir"
-	python3 setup.py install --root="$pkgdir" --optimize=1
+	python3 setup.py install --root="$pkgdir"
 }
 
-sha512sums="dbbdd328296cb9545f4ea8843fdc951c72c53b54f87a6c589c8d19fa34d2f48a2fb902a918f34196009740b4b6574dc8aabd5c408dcea2905cbb7094238be834  hbmqtt-0.9.6.tar.gz"
+sha512sums="
+dbbdd328296cb9545f4ea8843fdc951c72c53b54f87a6c589c8d19fa34d2f48a2fb902a918f34196009740b4b6574dc8aabd5c408dcea2905cbb7094238be834  hbmqtt-0.9.6.tar.gz
+"
diff --git a/testing/py3-imageio/APKBUILD b/testing/py3-imageio/APKBUILD
index 0d0ce99624a..80c99fa1a12 100644
--- a/testing/py3-imageio/APKBUILD
+++ b/testing/py3-imageio/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
 pkgname=py3-imageio
 pkgver=2.23.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Python library that provides an easy interface to read and write a wide range of image data"
 url="https://github.com/imageio/imageio"
 license="BSD-2-Clause"
@@ -24,7 +24,7 @@ check() {
 }
 
 package() {
-	python3 setup.py install --root="$pkgdir" --optimize=1
+	python3 setup.py install --root="$pkgdir"
 
 	# remove unneeded binaries
 	rm -r "$pkgdir"/usr/bin
diff --git a/testing/py3-minidb/APKBUILD b/testing/py3-minidb/APKBUILD
index bd958e268bf..6eb0e7266ed 100644
--- a/testing/py3-minidb/APKBUILD
+++ b/testing/py3-minidb/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Thiago Perrotta <tbperrotta@gmail.com>
 pkgname=py3-minidb
 pkgver=2.0.7
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple SQLite3 store for Python objects"
 url="https://thp.io/2010/minidb"
 arch="noarch"
@@ -10,7 +10,6 @@ license="ISC"
 depends="python3"
 makedepends="py3-setuptools"
 checkdepends="py3-pytest"
-subpackages="$pkgname-doc"
 source="https://files.pythonhosted.org/packages/source/m/minidb/minidb-$pkgver.tar.gz"
 builddir="$srcdir/minidb-$pkgver/"
 
@@ -23,10 +22,7 @@ check() {
 }
 
 package() {
-	python3 setup.py install --root="$pkgdir" --optimize=1 --skip-build
-
-	install -d "$pkgdir/usr/share/licenses/$pkgname"
-	sed -n '/# Copyright/,/OF THIS SOFTWARE./p' minidb.py > "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+	python3 setup.py install --root="$pkgdir" --skip-build
 }
 
 sha512sums="
diff --git a/testing/py3-proglog/APKBUILD b/testing/py3-proglog/APKBUILD
index bb1455d521b..2a1f61b9c51 100644
--- a/testing/py3-proglog/APKBUILD
+++ b/testing/py3-proglog/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
 pkgname=py3-proglog
 pkgver=0.1.9
-pkgrel=2
+pkgrel=3
 pkgdesc="Log and progress bar manager for console, notebooks, web"
 url="https://github.com/Edinburgh-Genome-Foundry/Proglog"
 arch="noarch"
@@ -17,7 +17,9 @@ build() {
 }
 
 package() {
-	python3 setup.py install --root="$pkgdir" --optimize=1
+	python3 setup.py install --root="$pkgdir"
 }
 
-sha512sums="9491bee1d1e15e047df19091e764dce02f5d7c698706766e5e8dc9494fd628af5a973751170b713641c8df5882f3964fcfdc8c6db66fb1d20e601cdcbf4bc019  proglog-0.1.9.tar.gz"
+sha512sums="
+9491bee1d1e15e047df19091e764dce02f5d7c698706766e5e8dc9494fd628af5a973751170b713641c8df5882f3964fcfdc8c6db66fb1d20e601cdcbf4bc019  proglog-0.1.9.tar.gz
+"
diff --git a/testing/py3-soappy/APKBUILD b/testing/py3-soappy/APKBUILD
index 2dbda632717..745e396bcc8 100644
--- a/testing/py3-soappy/APKBUILD
+++ b/testing/py3-soappy/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting>
 pkgname=py3-soappy
 pkgver=0.52.25
-pkgrel=3
+pkgrel=4
 pkgdesc="Simple to use SOAP library for Python"
 url="https://github.com/Synerty/SOAPpy-py3"
 options="!check" # Requires running servere
@@ -18,7 +18,9 @@ build() {
 }
 
 package() {
-	python3 setup.py install --root="$pkgdir" --optimize=1
+	python3 setup.py install --root="$pkgdir"
 }
 
-sha512sums="5a81f863f3ba61c507767bdbef3fd7830f0a435280cf0ccc2ff0d74f98cf6b917294e96fb5a5bf3c132545cb28c2203e00707ea9c31a5bb2b0be1f37863b821f  SOAPpy-py3-0.52.25.tar.gz"
+sha512sums="
+5a81f863f3ba61c507767bdbef3fd7830f0a435280cf0ccc2ff0d74f98cf6b917294e96fb5a5bf3c132545cb28c2203e00707ea9c31a5bb2b0be1f37863b821f  SOAPpy-py3-0.52.25.tar.gz
+"
diff --git a/testing/py3-tlslite-ng/APKBUILD b/testing/py3-tlslite-ng/APKBUILD
index b94c186bfca..17c6b0ea365 100644
--- a/testing/py3-tlslite-ng/APKBUILD
+++ b/testing/py3-tlslite-ng/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting>
 pkgname=py3-tlslite-ng
 pkgver=0.7.6
-pkgrel=4
+pkgrel=5
 pkgdesc="Pure python implementation of SSL and TLS"
 url="https://github.com/tlsfuzzer/tlslite-ng"
 arch="noarch"
@@ -22,7 +22,9 @@ build() {
 }
 
 package() {
-	python3 setup.py install --root="$pkgdir" --optimize=1
+	python3 setup.py install --root="$pkgdir"
 }
 
-sha512sums="c4fcdfaf45b40cd85fee26657956651b781d41f9c9f35a8a927d00c9f13cdcfae1b4f7a594d0d07d08d477b19480af152988c6075dc9f564215761bcf9857119  py3-tlslite-ng-0.7.6.tar.gz"
+sha512sums="
+c4fcdfaf45b40cd85fee26657956651b781d41f9c9f35a8a927d00c9f13cdcfae1b4f7a594d0d07d08d477b19480af152988c6075dc9f564215761bcf9857119  py3-tlslite-ng-0.7.6.tar.gz
+"
diff --git a/testing/py3-vici/APKBUILD b/testing/py3-vici/APKBUILD
index bd43742b96c..e6be87110c1 100644
--- a/testing/py3-vici/APKBUILD
+++ b/testing/py3-vici/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting>
 pkgname=py3-vici
 pkgver=5.9.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Native Python interface for strongSwan's VICI protocol"
 url="https://strongswan.org"
 arch="noarch"
 license="MIT"
 depends="python3"
 makedepends="automake autoconf py3-setuptools"
-checkdepends="py3-pytest py3-tox"
+checkdepends="py3-pytest"
 source="https://github.com/strongswan/strongswan/releases/download/$pkgver/strongswan-$pkgver.tar.bz2
 	use-sitepackages.patch
 	"
@@ -27,12 +27,13 @@ build() {
 }
 
 check() {
-	make -C src/libcharon/plugins/vici/python check
+	cd src/libcharon/plugins/vici/python
+	pytest
 }
 
 package() {
 	cd src/libcharon/plugins/vici/python/
-	python3 setup.py install --root="$pkgdir" --optimize=1
+	python3 setup.py install --root="$pkgdir"
 }
 
 sha512sums="
diff --git a/testing/py3-wstools/APKBUILD b/testing/py3-wstools/APKBUILD
index 75ca65063d9..baa28356cd9 100644
--- a/testing/py3-wstools/APKBUILD
+++ b/testing/py3-wstools/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting>
 pkgname=py3-wstools
 pkgver=0.4.10
-pkgrel=3
+pkgrel=4
 url="https://github.com/pycontribs/wstools"
 pkgdesc="WSDL parsing services package for Web Services for Python"
 arch="noarch"
@@ -15,12 +15,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/pycontribs/wstools/archive/$
 	"
 builddir="$srcdir/wstools-$pkgver"
 
-prepare() {
-	default_prepare
-	export PBR_VERSION=$pkgver
-}
-
 build() {
+	export PBR_VERSION=$pkgver
 	python3 setup.py build
 }
 
@@ -29,7 +25,7 @@ check() {
 }
 
 package() {
-	python3 setup.py install --root="$pkgdir" --optimize=1
+	python3 setup.py install --root="$pkgdir"
 }
 
 sha512sums="
diff --git a/testing/tartube/APKBUILD b/testing/tartube/APKBUILD
index 4c99c1f01c3..7310017e159 100644
--- a/testing/tartube/APKBUILD
+++ b/testing/tartube/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
 pkgname=tartube
 pkgver=2.4.165
-pkgrel=0
+pkgrel=1
 pkgdesc="GUI front-end for youtube-dl, partly based on youtube-dl-gui and written in Python 3 / Gtk 3"
 url="https://github.com/axcore/tartube"
 arch="noarch !s390x" # freeimage
@@ -42,15 +42,11 @@ check() {
 }
 
 package() {
-	python3 setup.py install \
-				--root="$pkgdir" \
-				--optimize=1
-	install -d "$pkgdir/usr/share/applications" \
-	"$pkgdir/usr/share/pixmaps"
+	python3 setup.py install --skip-build --root="$pkgdir"
 	_sitepkgs_dir="$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")"
 	mv "$pkgdir/tartube/icons" "$pkgdir$_sitepkgs_dir/tartube/"
 	rm -rvf "$pkgdir"/tartube
-	install -Dm644 pack/tartube.png "$pkgdir"/usr/share/pixmaps/tartube.png
+	install -Dm644 pack/tartube.png "$pkgdir"/usr/share/icons/hicolor/48x48/apps/tartube.png
 	install -Dm644 pack/tartube.desktop "$pkgdir"/usr/share/applications/tartube.desktop
 }
 
diff --git a/testing/urlwatch/APKBUILD b/testing/urlwatch/APKBUILD
index e73ff715c75..0a5770e892b 100644
--- a/testing/urlwatch/APKBUILD
+++ b/testing/urlwatch/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Thiago Perrotta <tbperrotta@gmail.com>
 pkgname=urlwatch
 pkgver=2.25
-pkgrel=1
+pkgrel=2
 pkgdesc="Tool for monitoring webpages for updates"
 url="https://thp.io/2008/urlwatch/"
 arch="noarch !ppc64le"  # blocked by py3-keyring
@@ -31,8 +31,7 @@ check() {
 }
 
 package() {
-	python3 setup.py install --root="$pkgdir" --optimize=1 --skip-build
-	install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" COPYING
+	python3 setup.py install --root="$pkgdir" --skip-build
 }
 
 sha512sums="