From d4db35ccff73807a223cf768655f066949cfa924 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 29 Oct 2020 19:18:10 -0400
Subject: [PATCH] Import some package bumps from aports

---
 sr.ht/py3-cairosvg/APKBUILD   |  6 +++---
 sr.ht/py3-cssselect2/APKBUILD | 17 +++++++----------
 sr.ht/py3-tinycss2/APKBUILD   |  8 ++++----
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/sr.ht/py3-cairosvg/APKBUILD b/sr.ht/py3-cairosvg/APKBUILD
index 8294252..03b9a45 100644
--- a/sr.ht/py3-cairosvg/APKBUILD
+++ b/sr.ht/py3-cairosvg/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Drew DeVault <sir@cmpwn.com>
 pkgname=py3-cairosvg
 _pyname=CairoSVG
-pkgver=2.4.2
-pkgrel=1
+pkgver=2.5.0
+pkgrel=0
 pkgdesc="Cairo-based SVG renderer for python"
 url="https://cairosvg.org"
 arch="noarch"
@@ -31,4 +31,4 @@ package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="0d6dd22d9569fd3849cf7f6594c86bed719169dac1f0f3219e88d82f9d245bf29d51715159085cb26c0340c8f0dcb88412d141ec0ee3710b1477626f5a578441  CairoSVG-2.4.2.tar.gz"
+sha512sums="9387273a5531f2e055871d3ccc3b770a46e549dceb443d9d7dbf3635f44da4a752f06ece2f86582f57eac08d59d78f833e1ed2e7badea340d5a0f1eb31beb24c  CairoSVG-2.5.0.tar.gz"
diff --git a/sr.ht/py3-cssselect2/APKBUILD b/sr.ht/py3-cssselect2/APKBUILD
index 9331443..9875c97 100644
--- a/sr.ht/py3-cssselect2/APKBUILD
+++ b/sr.ht/py3-cssselect2/APKBUILD
@@ -2,34 +2,31 @@
 # Maintainer: Drew DeVault <sir@cmpwn.com>
 pkgname=py3-cssselect2
 _pyname=cssselect2
-pkgver=0.3.0
+pkgver=0.4.1
 pkgrel=0
 pkgdesc="CSS selectors for Python ElementTree"
 url="https://pypi.org/projects/cssselect2/"
 arch="noarch"
 license="BSD-3-Clause"
 depends="py3-tinycss2"
-makedepends="py3-setuptools"
 checkdepends="py3-pytest py3-pytest-cov py3-pytest-isort py3-pytest-flake8"
 _pypiprefix="${_pyname%${_pyname#?}}"
-source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz"
+source="
+	https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz
+"
 builddir="$srcdir"/$_pyname-$pkgver
-
-prepare() {
-	# import sorting is broken upstream
-	sed -i setup.cfg -e 's/--isort//'
-}
+options="!check" # upstream tests are broken
 
 build() {
 	python3 setup.py build
 }
 
 check() {
-	python3 setup.py pytest
+	pytest
 }
 
 package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="ae59314654d1c1ddf982b77521de7743d1496145a1367f51e02b6067d6757940e7ccb50b67959630f472972473a1e87cec8dfbc8eeb68ad5f16465a36b1447be  cssselect2-0.3.0.tar.gz"
+sha512sums="feafeec3dbe3157ee452d94cd391a09cfcb48ca8bd1563c117c77c9ceb01102c4989611ede39e433ec25d3ddda98a94c4589ccb290b79c729683e673763b42ac  cssselect2-0.4.1.tar.gz"
diff --git a/sr.ht/py3-tinycss2/APKBUILD b/sr.ht/py3-tinycss2/APKBUILD
index 5eb8d49..aea87fb 100644
--- a/sr.ht/py3-tinycss2/APKBUILD
+++ b/sr.ht/py3-tinycss2/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Drew DeVault <sir@cmpwn.com>
 pkgname=py3-tinycss2
 _pyname=tinycss2
-pkgver=1.0.2
-pkgrel=4
+pkgver=1.1.0
+pkgrel=0
 pkgdesc="Low-level CSS parser for Python"
 url="https://pypi.python.org/pypi/tinycss2"
 arch="noarch"
@@ -15,7 +15,7 @@ _pypiprefix="${_pyname%${_pyname#?}}"
 source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz"
 builddir="$srcdir"/$_pyname-$pkgver
 replaces="py-tinycss py2-tinycss py3-tinycss"
-options="!check" # flake problems
+options="!check" # upstream tests are broken
 
 build() {
 	python3 setup.py build
@@ -29,4 +29,4 @@ package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="69bdf52898f9e704c01fe5fd11170e0efc9a6aca14646f5331fc06ebbdf941f9b6c798ded7d93636c7b810b35c659750c3ece3917c5c9cef4092e3e17b382dd1  tinycss2-1.0.2.tar.gz"
+sha512sums="218d28511802afc89a608def03084f5d460512a41d47280b5c8bfe72314c8ab3b14c98fbb0200bea6b8509c4d6f0107410d340e2d7f1830aaa92669a2699211e  tinycss2-1.1.0.tar.gz"
-- 
2.45.2