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

[Felix Yan]

    Date: Sunday, June 22, 2014 @ 05:12:54
  Author: fyan
Revision: 113407

upgpkg: python-networkx 1.9-1

Modified:
  python-networkx/trunk/PKGBUILD

----------+
 PKGBUILD |   52 +++++++++++++++++++++++-----------------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-22 03:10:54 UTC (rev 113406)
+++ PKGBUILD	2014-06-22 03:12:54 UTC (rev 113407)
@@ -4,59 +4,53 @@
 
 pkgbase=python-networkx
 pkgname=(python-networkx python2-networkx)
-_pythonname=networkx
-pkgver=1.8.1
-pkgrel=3
+_pypiname=networkx
+pkgver=1.9
+pkgrel=1
 pkgdesc='Python package for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks.'
 arch=('any')
 license=('BSD')
 url="http://networkx.github.io"
-makedepends=('python-setuptools' 'python2-setuptools')
+makedepends=('python-setuptools' 'python2-setuptools' 'python-decorator' 'python2-decorator')
 checkdepends=('python-nose' 'python2-nose')
-source=("https://github.com/networkx/networkx/archive/${_pythonname}-${pkgver}.tar.gz"
-        python-3.4.patch)
-md5sums=('f7961b12b5db92109befa1d3de1b1e0e'
-         'fb33088811cba7e6d959d8770990f018')
+source=("https://github.com/networkx/networkx/archive/${_pypiname}-${pkgver}.tar.gz")
+md5sums=('8eebdcc1b4091af9b806b9f4c887ff55')
 
 prepare() {
-  cd ${_pythonname}-${_pythonname}-$pkgver
-  patch -p1 -i ../python-3.4.patch
-
-  cd ..
-  cp -r ${_pythonname}-${_pythonname}-$pkgver{,-py2}
+  cp -r ${_pypiname}-${_pypiname}-$pkgver{,-py2}
 }
 
 build() {
-  cd "$srcdir/${_pythonname}-${_pythonname}-$pkgver"
-  python3 setup_egg.py build
+  cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver"
+  python3 setup.py build
 
-  cd "$srcdir/${_pythonname}-${_pythonname}-$pkgver-py2"
-  python2 setup_egg.py build
+  cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver-py2"
+  python2 setup.py build
 }
 
 check() {
-  cd "$srcdir/${_pythonname}-${_pythonname}-$pkgver"
-  python3 setup_egg.py nosetests || true  # Tests fail randomly
+  cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver"
+  python3 setup.py nosetests #|| true  # Tests fail randomly
 
-  cd "$srcdir/${_pythonname}-${_pythonname}-$pkgver-py2"
-  python2 setup_egg.py nosetests
+  cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver-py2"
+  python2 setup.py nosetests
 }
 
 package_python-networkx() {
-  depends=('python')
+  depends=('python-decorator')
   optdepends=('python-numpy: Provides sparse matrix representation of graphs and many numerical scientific tools.'
               'python-scipy: Provides flexible drawing of graphs.'
               'python-pyparsing: Required for pydot, GML file reading.'
               'python-yaml: Required for YAML format reading and writing.')
 
-  cd "$srcdir/${_pythonname}-${_pythonname}-$pkgver"
-  python3 setup_egg.py install --root="$pkgdir" --optimize=1
+  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/${_pythonname}-$pkgver" "$pkgdir/usr/share/doc/$pkgname"
+  mv "$pkgdir/usr/share/doc/${_pypiname}-$pkgver" "$pkgdir/usr/share/doc/$pkgname"
 }
 
 package_python2-networkx() {
-  depends=('python2')
+  depends=('python2-decorator')
   optdepends=('python2-numpy: Provides sparse matrix representation of graphs and many numerical scientific tools.'
               'python2-scipy: Provides flexible drawing of graphs.'
               'python2-pygraphviz: Provides graph drawing and graph layout algorithms.'
@@ -64,8 +58,8 @@
               'python2-pyparsing: Required for pydot, GML file reading.'
               'python2-yaml: Required for YAML format reading and writing.')
 
-  cd "$srcdir/${_pythonname}-${_pythonname}-$pkgver-py2"
-  python2 setup_egg.py install --root="$pkgdir" --optimize=1
+  cd "$srcdir/${_pypiname}-${_pypiname}-$pkgver-py2"
+  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/${_pythonname}-$pkgver" "$pkgdir/usr/share/doc/$pkgname"
+  mv "$pkgdir/usr/share/doc/${_pypiname}-$pkgver" "$pkgdir/usr/share/doc/$pkgname"
 }