[arch-commits] Commit in python-pillow/trunk (PKGBUILD)

[Kyle Keen]

    Date: Monday, June 15, 2020 @ 22:13:56
  Author: kkeen
Revision: 645579

upgpkg: python-pillow 7.1.2-1

Modified:
  python-pillow/trunk/PKGBUILD

----------+
 PKGBUILD |   45 ++++++++++++---------------------------------
 1 file changed, 12 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-15 22:11:32 UTC (rev 645578)
+++ PKGBUILD	2020-06-15 22:13:56 UTC (rev 645579)
@@ -1,26 +1,26 @@
 # Maintainer: Kyle Keen <keenerd at gmail.com>
 # Contributor: minder
 
-pkgbase=python-pillow
-pkgname=(python-pillow python2-pillow)
-pkgver=6.2.1
+pkgname=python-pillow
+pkgver=7.1.2
 pkgrel=1
 _appname=Pillow
-_py2basever=2.7
 _py3basever=3.8
-pkgdesc="Python Imaging Library (PIL) fork. Python3 version."
+pkgdesc="Python Imaging Library (PIL) fork."
 arch=('x86_64')
 url="https://python-pillow.github.io/"
 license=('BSD')
-depends=('lcms2' 'libtiff' 'openjpeg2' 'libimagequant')
+depends=('python' 'lcms2' 'libtiff' 'openjpeg2' 'libimagequant')
 optdepends=('freetype2: for the ImageFont module'
             'libraqm: for complex text scripts'
             'libwebp: for webp images'
-            'tk: for the ImageTK module')
-makedepends=('python-setuptools' 'python2-setuptools' 'freetype2' 'libraqm' 'libwebp' 'tk')
-checkdepends=('python-pytest' 'python2-pytest')
+            'tk: for the ImageTK module'
+            'python-olefile: OLE2 file support'
+            'python-pyqt5: for the ImageQt module')
+makedepends=('python-setuptools' 'freetype2' 'libraqm' 'libwebp' 'tk')
+checkdepends=('python-pytest')
 source=("https://files.pythonhosted.org/packages/source/P/$_appname/$_appname-$pkgver.tar.gz")
-md5sums=('13acde283ece6ac69f62609fa108d316')
+md5sums=('f1f7592c51260e5080d3cd71781ea675')
 
 prepare() {
   cd "$srcdir/$_appname-$pkgver"
@@ -29,7 +29,6 @@
 build() {
   cd "$srcdir/$_appname-$pkgver"
   python setup.py build
-  python2 setup.py build
 }
 
 check() {
@@ -37,16 +36,10 @@
 
   export PYTHONPATH="$PWD/build/lib.linux-$CARCH-${_py3basever%m}"
   python selftest.py
-  pytest
-  export PYTHONPATH="$PWD/build/lib.linux-$CARCH-$_py2basever"
-  python2 selftest.py
-  pytest2
+  pytest -k 'not test_complex_unicode_text and not TestImageFont'
 }
 
-package_python-pillow() {
-  depends+=('python')
-  optdepends+=('python-olefile: OLE2 file support'
-               'python-pyqt5: for the ImageQt module')
+package() {
   cd "$srcdir/$_appname-$pkgver"
   python3 setup.py install --root="$pkgdir/" --optimize=1
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -55,17 +48,3 @@
   install -m644 -t "$pkgdir/usr/include/python$_py3basever/" src/libImaging/*.h
 }
 
-package_python2-pillow() {
-  pkgdesc="Python Imaging Library (PIL) fork. Python2 version."
-  depends+=('python2')
-  optdepends+=('python2-olefile: OLE2 file support'
-               'python2-pyqt5: for the ImageQt module')
-  provides=('python-imaging' 'python2-imaging')
-  conflicts=('python-imaging' 'python2-imaging')
-  cd "$srcdir/$_appname-$pkgver"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  install -dm755 "$pkgdir/usr/include/python$_py2basever/"
-  install -m644 -t "$pkgdir/usr/include/python$_py2basever/" src/libImaging/*.h
-}