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

[Felix Yan]

    Date: Thursday, September 20, 2018 @ 10:02:57
  Author: felixonmars
Revision: 383525

upgpkg: python-networkx 2.2-1

Modified:
  python-networkx/trunk/PKGBUILD

----------+
 PKGBUILD |   43 +++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-20 10:02:48 UTC (rev 383524)
+++ PKGBUILD	2018-09-20 10:02:57 UTC (rev 383525)
@@ -3,9 +3,8 @@
 
 pkgbase=python-networkx
 pkgname=(python-networkx python2-networkx)
-_pypiname=networkx
-pkgver=2.1
-pkgrel=3
+pkgver=2.2
+pkgrel=1
 pkgdesc='Python package for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks.'
 arch=('any')
 license=('BSD')
@@ -12,30 +11,18 @@
 url="https://networkx.github.io"
 makedepends=('python-setuptools' 'python2-setuptools' 'python-decorator' 'python2-decorator')
 checkdepends=('python-nose' 'python2-nose')
-source=("https://github.com/networkx/networkx/archive/${_pypiname}-${pkgver}.tar.gz"
-        "0001-Fix-StopIteration-handling-which-breaks-in-python-3..patch")
-sha512sums=('1db1d4e6e6add25509b79b24bcdc30e934b3be714898dcad8092db56908fe40eec47952336b9cbb3662cf5026c821c50db7a2d8578a4dda93585ee0aaf8210ec'
-            'acd4f982f0773a7eaf0c8034a512b28d367fc9aee5a2d480461451f2d76ff88af2016b2d87b5f70c46af75b9f0d2306e73ab0ffbc5584003153cfbcdc3c72380')
+source=("https://github.com/networkx/networkx/archive/networkx-$pkgver.tar.gz")
+sha512sums=('247ca4d66d33cec86412df846cc1fdbe1cbb0eeee83fb2a9ccdd702eb1453dd7167b397ed77d6b3dfdef6346485160ce75c12be58372238aaf98d334b4c8aeb4')
 
-prepare() {
-  # backport fix for python3.7 testsuite: https://github.com/networkx/networkx/issues/3046
-  patch -p1 -d ${_pypiname}-${_pypiname}-$pkgver < 0001-Fix-StopIteration-handling-which-breaks-in-python-3..patch
-  cp -a ${_pypiname}-${_pypiname}-$pkgver{,-py2}
-}
-
 build() {
-  cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver"
-  python3 setup.py build
-
-  cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver-py2"
+  cd networkx-networkx-$pkgver
+  python setup.py build
   python2 setup.py build
 }
 
 check() {
-  cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver"
-  python3 setup.py nosetests #|| true  # Tests fail randomly
-
-  cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver-py2"
+  cd networkx-networkx-$pkgver
+  python setup.py nosetests
   python2 setup.py nosetests
 }
 
@@ -46,10 +33,10 @@
               'python-pyparsing: Required for pydot, GML file reading.'
               'python-yaml: Required for YAML format reading and writing.')
 
-  cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver"
-  python3 setup.py install --root="$pkgdir" --optimize=1
-  install -D -m 644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
-  mv "$pkgdir/usr/share/doc/${_pypiname}-$pkgver" "$pkgdir/usr/share/doc/$pkgname"
+  cd networkx-networkx-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1
+  install -D -m 644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
+  mv "$pkgdir"/usr/share/doc/networkx-$pkgver "$pkgdir"/usr/share/doc/$pkgname
 }
 
 package_python2-networkx() {
@@ -60,8 +47,8 @@
               'python2-pyparsing: Required for pydot, GML file reading.'
               'python2-yaml: Required for YAML format reading and writing.')
 
-  cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver-py2"
+  cd networkx-networkx-$pkgver
   python2 setup.py install --root="$pkgdir" --optimize=1
-  install -D -m 644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
-  mv "$pkgdir/usr/share/doc/${_pypiname}-$pkgver" "$pkgdir/usr/share/doc/$pkgname"
+  install -D -m 644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
+  mv "$pkgdir"/usr/share/doc/networkx-$pkgver "$pkgdir"/usr/share/doc/$pkgname
 }