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

[Felix Yan]

    Date: Thursday, March 10, 2016 @ 07:40:43
  Author: fyan
Revision: 165808

upgpkg: python-sympy 1.0-1

new version; rename executables

Modified:
  python-sympy/trunk/PKGBUILD

----------+
 PKGBUILD |   56 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-10 06:38:03 UTC (rev 165807)
+++ PKGBUILD	2016-03-10 06:40:43 UTC (rev 165808)
@@ -6,9 +6,8 @@
 # Contributor: Peter Garceau <RockyChimp at gmail.com>
 
 pkgbase=python-sympy
-pkgname=('python2-sympy' 'python-sympy')
-pkgver=1.0rc1
-_commit=323d4a54eb94f6b79f32dd69779bf1952097def9
+pkgname=('python-sympy' 'python2-sympy')
+pkgver=1.0
 pkgrel=1
 arch=('any')
 pkgdesc='Symbolic manipulation package (Computer Algebra System), written in pure Python'
@@ -15,55 +14,54 @@
 url='http://sympy.org/en/index.html'
 license=('BSD')
 makedepends=('python2-mpmath' 'python-mpmath' 'python-setuptools' 'python2-setuptools' 'git')
-#source=("git+https://github.com/sympy/sympy.git#tag=sympy-${pkgver}"
-source=("git+https://github.com/sympy/sympy.git#commit=$_commit")
+source=("git+https://github.com/sympy/sympy.git#tag=sympy-$pkgver")
 sha512sums=('SKIP')
 
 prepare() {
-  cp -a sympy py3-sympy
+  cp -a sympy{,-py2}
 }
 
 build() {
-  cd sympy
+  cd "$srcdir"/sympy
+  python setup.py build
+
+  cd "$srcdir"/sympy-py2
   python2 setup.py build
-
-  cd ../py3-sympy
-  python3 setup.py build
 }
 
 check() {
   # Broken, waiting for upstream fixes.
 
-  cd sympy
+  cd "$srcdir"/sympy
+  python setup.py test || warning "Exit code: $?"
+
+  cd "$srcdir"/sympy-py2
   python2 setup.py test || warning "Exit code: $?"
-
-  cd ../py3-sympy
-  python3 setup.py test || warning "Exit code: $?"
 }
 
-package_python2-sympy() {
-  depends=('python2-mpmath')
-  optdepends=('python2-pyglet: plotting'
-              'ipython2: user friendly interface for isympy')
+package_python-sympy() {
+  depends=('python-mpmath')
+  optdepends=('ipython: user friendly interface for isympy')
 
   cd sympy
 
-  python2 setup.py install --root "${pkgdir}" --optimize=1
+  python setup.py install --root "$pkgdir" --optimize=1
 
-  install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-package_python-sympy() {
-  depends=('python-mpmath')
-  optdepends=('ipython: user friendly interface for isympy')
+package_python2-sympy() {
+  depends=('python2-mpmath')
+  optdepends=('python2-pyglet: plotting'
+              'ipython2: user friendly interface for isympy')
 
-  cd py3-sympy
+  cd sympy-py2
 
-  python3 setup.py install --root "${pkgdir}" --optimize=1
+  python2 setup.py install --root "$pkgdir" --optimize=1
 
-  # rename files that exists in both 'python2-sympy' and 'python-sympy'
-  mv "${pkgdir}"/usr/bin/isympy{,-py3}
-  mv "${pkgdir}"/usr/share/man/man1/isympy{,-py3}.1
+  # rename files that exists in both 'python-sympy' and 'python2-sympy'
+  mv "$pkgdir"/usr/bin/isympy{,2}
+  mv "$pkgdir"/usr/share/man/man1/isympy{,2}.1
 
-  install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }