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

[Felix Yan]

    Date: Friday, August 25, 2017 @ 13:42:47
  Author: felixonmars
Revision: 253363

upgpkg: python-shapely 1.6.0-1

Modified:
  python-shapely/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-25 12:13:35 UTC (rev 253362)
+++ PKGBUILD	2017-08-25 13:42:47 UTC (rev 253363)
@@ -5,18 +5,22 @@
 
 pkgbase=python-shapely
 pkgname=(python-shapely python2-shapely)
-pkgver=1.5.17
-pkgrel=2
+pkgver=1.6.0
+pkgrel=1
 pkgdesc="Manipulation and analysis of geometric objects in the Cartesian plane"
 arch=('i686' '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')
+makedepends=('python-setuptools' 'python2-setuptools' 'python-packaging' 'python2-packaging' 'geos'
+             'python-numpy' 'python2-numpy' 'cython' 'cython2')
 checkdepends=('python-pytest' 'python2-pytest')
 source=("https://pypi.io/packages/source/S/Shapely/Shapely-${pkgver}.tar.gz")
-md5sums=('afb3feef824bde120cd0eb63caf863f4')
+md5sums=('83768fd1104a82148f4bee38597af49e')
 
 prepare() {
+  rm -r Shapely-$pkgver/_vendor
+  sed -i 's/from _vendor.packaging./from packaging./' Shapely-$pkgver/setup.py
+
   cp -a Shapely-$pkgver{,-py2}
 }
 
@@ -49,12 +53,8 @@
   cd "$srcdir"/Shapely-$pkgver
   python setup.py install --root="$pkgdir" --optimize=1
   install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
 
-  # Temporary workaround for file conflict, also the path was not following FHS
-  # https://github.com/Toblerity/Shapely/issues/287
-  mv "$pkgdir"/usr/{shapely,lib/$pkgname}
-}
- 
 package_python2-shapely() {
   depends=('geos' 'python2')
   optdepends=('python2-numpy: for shapely.vectorized submodule')
@@ -62,8 +62,6 @@
   cd "$srcdir"/Shapely-$pkgver-py2
   python2 setup.py install --root="$pkgdir" --optimize=1
   install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-
-  mv "$pkgdir"/usr/{shapely,lib/$pkgname}
 }
 
 # vim:set ts=2 sw=2 et: