Add npm as makedependency

2 files changed, 27 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4839a9d66df6..de91489b2ac0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,17 @@
 pkgbase = python-chemview-git
 	pkgdesc = An interactive molecular viewer for the IPython notebook (git version)
-	pkgver = 0.3.r87.c7e9150
+	pkgver = 0.7.r10.g2c9768d
 	pkgrel = 1
-	url = http://chemview.readthedocs.org/en/latest
+	url = https://github.com/gabrielelanaro/chemview
 	arch = any
 	license = LGPL2.1
 	makedepends = git
-	depends = python
-	depends = python-numpy
+	makedepends = npm
 	depends = python-numba
-	depends = ipython-notebook
-	depends = python2
-	depends = python2-numpy
-	depends = python2-numba
-	depends = ipython2-notebook
-	source = git+https://github.com/gabrielelanaro/chemview
-	sha256sums = SKIP
-
-pkgname = python-chemview-git
+	depends = jupyter-notebook
 	provides = python-chemview
 	conflicts = python-chemview
+	source = git+https://github.com/gabrielelanaro/chemview
+	sha512sums = SKIP
 
-pkgname = python2-chemview-git
-	provides = python2-chemview
-	conflicts = python2-chemview
-
+pkgname = python-chemview-git
diff --git a/PKGBUILD b/PKGBUILD
index 20b9f2a7855b..4a1224424159 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,32 @@
-# Maintainer: Eric Berquist <eric DOT berquist AT gmail DOT com>
+# Contributor: Eric Berquist <eric DOT berquist AT gmail DOT com>
 
-_name="chemview"
-pkgbase="python-${_name}-git"
-pkgname=("python-${_name}-git" "python2-${_name}-git")
-pkgver=0.3.r87.c7e9150
+_name=chemview
+pkgname=python-${_name}-git
+pkgver=0.7.r10.g2c9768d
 pkgrel=1
 pkgdesc="An interactive molecular viewer for the IPython notebook (git version)"
-arch=("any")
-url="http://chemview.readthedocs.org/en/latest"
+arch=(any)
+url="https://github.com/gabrielelanaro/${_name}"
 license=("LGPL2.1")
-depends=("python" "python-numpy" "python-numba" "ipython-notebook"
-         "python2" "python2-numpy" "python2-numba" "ipython2-notebook")
-makedepends=("git")
-source=("git+https://github.com/gabrielelanaro/${_name}")
-sha256sums=('SKIP')
+depends=(python-numba jupyter-notebook)
+makedepends=(git npm)
+source=(git+${url})
+sha512sums=('SKIP')
+provides=(python-${_name})
+conflicts=(python-${_name})
 
 pkgver() {
-  cd "${srcdir}/${_name}"
-  _parent_ver=$(git log --tags --simplify-by-decoration --pretty="format:%d" | head -n 1 | cut -d " " -f 6 | tr -d "v,")
-  printf "%s.r%s.%s" \
-         "${_parent_ver}" \
-         "$(git rev-list --count HEAD)" \
-         "$(git rev-parse --short HEAD)"
+  cd ${_name}
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-build_python-chemview-git() {
-  cd "${srcdir}/${_name}"
+build() {
+  cd ${_name}
   python setup.py build
 }
 
-build_python2-chemview-git() {
-  cd "${srcdir}/${_name}"
-  python2 setup.py build
-}
-
-package_python-chemview-git() {
-  provides=("python-${_name}")
-  conflicts=("python-${_name}")
-  cd "${srcdir}/${_name}"
-  python setup.py install --root="${pkgdir}" --optimize=1
-}
-
-package_python2-chemview-git() {
-  provides=("python2-${_name}")
-  conflicts=("python2-${_name}")
-  cd "${srcdir}/${_name}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
+package() {
+  cd ${_name}
+  PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }