This thread contains a patchset. You're looking at the original emails,
but you may wish to use the patch review UI.
Review patch
3
2
[PATCH] testing/py3-cairosvg: upgrade to 2.4.1
---
testing/py3-cairosvg/APKBUILD | 10 +++++++ ---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/testing/py3-cairosvg/APKBUILD b/testing/py3-cairosvg/APKBUILD
index 917c18cd36..cf6a39ce78 100644
--- a/testing/py3-cairosvg/APKBUILD
+++ b/testing/py3-cairosvg/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=py3-cairosvg
_pyname=CairoSVG
- pkgver=2.4.0
+ pkgver=2.4.1
pkgrel=0
pkgdesc="Cairo-based SVG renderer for python"
url="https://cairosvg.org"
@@ -11,7 +11,10 @@ depends="python3 py3-tinycss2 py3-cssselect2 py3-defusedxml py3-cairocffi"
checkdepends="py3-pytest py3-pillow py3-pytest-flake8 py3-pytest-isort"
makedepends="python3-dev py3-setuptools cairo-dev"
_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
+ fix-flaky-tests.patch
+ "
builddir="$srcdir"/CairoSVG-$pkgver
replaces="py-cairosvg" # Backwards compat
provides="py-cairosvg=$pkgver-r$pkgrel" # Backwards compat
@@ -28,4 +31,5 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
- sha512sums="07eeaffa584b1c40c88c3d287b041c3f097700e49b8d85ba80e8dbc1f27aee6e5cf488db0174fc72783a727c29b6b578b1ff31d86833723681cc7fb084226c46 CairoSVG-2.4.0.tar.gz"
+ sha512sums="bccc4f5aeccede49fa62d4384869d5d5602a368f6dc034c9c00217f4b527bd60beecd4026aac763551d6ec03bc951014042bfd96602b9a78d9c66f87270a8ac6 CairoSVG-2.4.1.tar.gz
+ 007b99675ed0ad01a30b59e4bdc58fff9e31b1e8966aac758ffbf1c29526cceeda6b239ee35e239ee44ad216111a2e0d70471ac458907a445169888f5124c72c fix-flaky-tests.patch"
--
2.23.0
On Thu, 22 Aug 2019 19:23:54 +0900
Drew DeVault <sir@cmpwn.com > wrote:
> ---
> testing/py3-cairosvg/APKBUILD | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
I get this error:
>>> py3-cairosvg: Checking sha512sums...
CairoSVG-2.4.1.tar.gz: OK
sha512sum: can't open 'fix-flaky-tests.patch': No such file or directory
fix-flaky-tests.patch: FAILED
sha512sum: WARNING: 1 of 1 computed checksums did NOT match
-nc
>
> diff --git a/testing/py3-cairosvg/APKBUILD b/testing/py3-cairosvg/APKBUILD
> index 917c18cd36..cf6a39ce78 100644
> --- a/testing/py3-cairosvg/APKBUILD
> +++ b/testing/py3-cairosvg/APKBUILD
> @@ -1,7 +1,7 @@
> # Maintainer: Drew DeVault <sir@cmpwn.com >
> pkgname=py3-cairosvg
> _pyname=CairoSVG
> -pkgver=2.4.0
> +pkgver=2.4.1
> pkgrel=0
> pkgdesc="Cairo-based SVG renderer for python"
> url="https://cairosvg.org"
> @@ -11,7 +11,10 @@ depends="python3 py3-tinycss2 py3-cssselect2 py3-defusedxml py3-cairocffi"
> checkdepends="py3-pytest py3-pillow py3-pytest-flake8 py3-pytest-isort"
> makedepends="python3-dev py3-setuptools cairo-dev"
> _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
> + fix-flaky-tests.patch
> +"
> builddir="$srcdir"/CairoSVG-$pkgver
> replaces="py-cairosvg" # Backwards compat
> provides="py-cairosvg=$pkgver-r$pkgrel" # Backwards compat
> @@ -28,4 +31,5 @@ package() {
> python3 setup.py install --prefix=/usr --root="$pkgdir"
> }
>
> -sha512sums="07eeaffa584b1c40c88c3d287b041c3f097700e49b8d85ba80e8dbc1f27aee6e5cf488db0174fc72783a727c29b6b578b1ff31d86833723681cc7fb084226c46 CairoSVG-2.4.0.tar.gz"
> +sha512sums="bccc4f5aeccede49fa62d4384869d5d5602a368f6dc034c9c00217f4b527bd60beecd4026aac763551d6ec03bc951014042bfd96602b9a78d9c66f87270a8ac6 CairoSVG-2.4.1.tar.gz
> +007b99675ed0ad01a30b59e4bdc58fff9e31b1e8966aac758ffbf1c29526cceeda6b239ee35e239ee44ad216111a2e0d70471ac458907a445169888f5124c72c fix-flaky-tests.patch"
On Thu, 22 Aug 2019 19:51:09 +0900
"Drew DeVault" <sir@cmpwn.com > wrote:
> Whoops, stupid mistake.
There is a git hook in .githooks/ that can help you prevent those.
-nc