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

[Felix Yan]

    Date: Tuesday, April 2, 2019 @ 12:34:08
  Author: felixonmars
Revision: 447661

upgpkg: python-shapely 1.6.4.post2-2

remove python2 sibling

Modified:
  python-shapely/trunk/PKGBUILD

----------+
 PKGBUILD |   44 ++++++++++----------------------------------
 1 file changed, 10 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-02 12:33:41 UTC (rev 447660)
+++ PKGBUILD	2019-04-02 12:34:08 UTC (rev 447661)
@@ -2,17 +2,17 @@
 # Contributor: David Verelst <david dot verelst at gmail com>
 # Contributor: richli
 
-pkgbase=python-shapely
-pkgname=(python-shapely python2-shapely)
+pkgname=python-shapely
 pkgver=1.6.4.post2
-pkgrel=1
+pkgrel=2
 pkgdesc="Manipulation and analysis of geometric objects in the Cartesian plane"
 arch=('x86_64')
 url="https://pypi.python.org/pypi/Shapely"
 license=('BSD')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-packaging' 'python2-packaging' 'geos'
-             'python-numpy' 'python2-numpy' 'cython' 'cython2')
-checkdepends=('python-pytest' 'python2-pytest')
+depends=('geos' 'python')
+optdepends=('python-numpy: for shapely.vectorized submodule')
+makedepends=('python-setuptools' 'python-packaging' 'python-numpy' 'cython')
+checkdepends=('python-pytest')
 source=("https://pypi.io/packages/source/S/Shapely/Shapely-${pkgver}.tar.gz")
 sha512sums=('027c816ef2104f654569ca658b52b87c60e5ba6a45927fcc51c23dd1922f3f9f7fdcea3601160b0a999e39611617142833ccac790777093be8b96a0d9083f78f')
 
@@ -19,48 +19,24 @@
 prepare() {
   rm -r Shapely-$pkgver/_vendor
   sed -i 's/from _vendor.packaging./from packaging./' Shapely-$pkgver/setup.py
-
-  cp -a Shapely-$pkgver{,-py2}
 }
 
 build() {
-  cd "$srcdir"/Shapely-$pkgver
+  cd Shapely-$pkgver
   python setup.py build
-
-  cd "$srcdir"/Shapely-$pkgver-py2
-  python2 setup.py build
 }
 
 check() {
   # TODO: make the hack less dirty...
 
-  cd "$srcdir"/Shapely-$pkgver
+  cd Shapely-$pkgver
   mv shapely shapely.bak
   PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.7:$PYTHONPATH" py.test
   mv shapely.bak shapely
-
-  cd "$srcdir"/Shapely-$pkgver-py2
-  mv shapely shapely.bak
-  PYTHONPATH="$PWD/build/lib.linux-$CARCH-2.7:$PYTHONPATH" py.test2
-  mv shapely.bak shapely
 }
 
-package_python-shapely() {
-  depends=('geos' 'python')
-  optdepends=('python-numpy: for shapely.vectorized submodule')
-
-  cd "$srcdir"/Shapely-$pkgver
+package() {
+  cd Shapely-$pkgver
   python setup.py install --root="$pkgdir" --optimize=1
   install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
-
-package_python2-shapely() {
-  depends=('geos' 'python2')
-  optdepends=('python2-numpy: for shapely.vectorized submodule')
-
-  cd "$srcdir"/Shapely-$pkgver-py2
-  python2 setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-# vim:set ts=2 sw=2 et: