diff options
| author | Mike Sullivan <mksully22@gmail.com> | 2019-09-03 16:23:42 +0000 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-09-26 20:17:10 +0000 |
| commit | 9ed08c8fb4311675ff64d0d8b6db00d6e9be6f6f (patch) | |
| tree | 8a06815e1d8f35e07a059287e3fb2d5d215d6b27 | |
| parent | 2190e763cd35bc01dea68937e260424a9e259a24 (diff) | |
| download | aports-9ed08c8fb4311675ff64d0d8b6db00d6e9be6f6f.tar.bz2 aports-9ed08c8fb4311675ff64d0d8b6db00d6e9be6f6f.tar.xz | |
main/py-pillow: running tests requires pytest version < 5
Closes GH-10856
| -rw-r--r-- | main/py-pillow/APKBUILD | 8 | ||||
| -rw-r--r-- | main/py-pillow/py-pillow-fix-pytest-ver.patch | 11 |
2 files changed, 16 insertions, 3 deletions
diff --git a/main/py-pillow/APKBUILD b/main/py-pillow/APKBUILD index 43d98b0f3b..c21a6de541 100644 --- a/main/py-pillow/APKBUILD +++ b/main/py-pillow/APKBUILD @@ -3,7 +3,7 @@ pkgname=py-pillow _pkgname=Pillow pkgver=6.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Python Imaging Library" url="https://python-pillow.org" arch="all" @@ -12,7 +12,8 @@ depends="py-olefile" makedepends="python2-dev python3-dev py-setuptools freetype-dev jpeg-dev libwebp-dev tiff-dev libpng-dev lcms2-dev libjpeg-turbo-dev zlib-dev" subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz + py-pillow-fix-pytest-ver.patch" builddir="$srcdir/$_pkgname-$pkgver" [ "$CARCH" = "s390x" ] && options="!check" @@ -54,4 +55,5 @@ _py() { $python setup.py install --prefix=/usr --root="$subpkgdir" } -sha512sums="0cd4617519506c9bcbd6eae0d2578a2e21e1c37a1e6175a31842d2671a2f159888f38f5345e50945b243a6fbd6e2feffd5cd7dd1601f48c6bc4858a4b3664c76 Pillow-6.0.0.tar.gz" +sha512sums="0cd4617519506c9bcbd6eae0d2578a2e21e1c37a1e6175a31842d2671a2f159888f38f5345e50945b243a6fbd6e2feffd5cd7dd1601f48c6bc4858a4b3664c76 Pillow-6.0.0.tar.gz +111562854bd87f9978c7cf05f9876e5a22bf49b7aad367ee54967b79f89e3cc39f8c5647fa297162b8869075f9d17e870a6ea6d5e0cdb150fdf6dcdbac5bf7b0 py-pillow-fix-pytest-ver.patch" diff --git a/main/py-pillow/py-pillow-fix-pytest-ver.patch b/main/py-pillow/py-pillow-fix-pytest-ver.patch new file mode 100644 index 0000000000..ccfe275af7 --- /dev/null +++ b/main/py-pillow/py-pillow-fix-pytest-ver.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -785,7 +785,7 @@ + ext_modules=[Extension("PIL._imaging", ["_imaging.c"])], + include_package_data=True, + setup_requires=pytest_runner, +- tests_require=['pytest'], ++ tests_require=['pytest < 5'], + packages=["PIL"], + package_dir={'': 'src'}, + keywords=["Imaging", ], |