Update to 3.18.0. Remove python2-ase

2 files changed, 14 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cc9219b50314..6bb0f6ef194f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,17 @@
 pkgbase = python-ase
 	pkgdesc = Atomic Simulation Environment (ASE) is a set of tools and Python modules for setting up, manipulating, running, visualizing and analyzing atomistic simulations.
-	pkgver = 3.17.0
+	pkgver = 3.18.0
 	pkgrel = 1
 	url = http://wiki.fysik.dtu.dk/ase
 	arch = any
 	license = LGPLv2.1+
 	makedepends = python-setuptools
-	source = https://gitlab.com/ase/ase/repository/archive.tar.gz?ref=3.17.0
-	md5sums = 1bee99e27e0ad510807626ba2d44e8a4
-
-pkgname = python-ase
 	depends = python-numpy
-	optdepends = python-scipy: For extra functionality
-	optdepends = python-matplotlib: 2D Plotting
-	optdepends = pygtk: For ase.gui
+	depends = python-scipy
+	optdepends = python-matplotlib: plotting
+	optdepends = python-flask: for ase.db web-interface
+	source = https://gitlab.com/ase/ase/repository/archive.tar.gz?ref=3.18.0
+	md5sums = 7fcb2a6fde47fb509ea68c913efddf24
 
-pkgname = python2-ase
-	depends = python2-numpy
-	optdepends = python2-scipy: For extra functionality
-	optdepends = python2-matplotlib: 2D Plotting
-	optdepends = pygtk: For ase.gui
+pkgname = python-ase
 
diff --git a/PKGBUILD b/PKGBUILD
index e8f0a20013b7..2bd57e815dab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,19 @@
 # Maintainer: Ross Whitfield <whitfieldre@ornl.gov>
-pkgname=('python-ase' 'python2-ase')
-pkgver=3.17.0
-_sha=741415367ed883fd16b74ee6610889f80111ec52
+pkgname='python-ase'
+pkgver=3.18.0
+_sha=a6279137460b2c723acbfd03188ebfc17753f42e
 pkgrel=1
 pkgdesc="Atomic Simulation Environment (ASE) is a set of tools and Python modules for setting up, manipulating, running, visualizing and analyzing atomistic simulations."
 url="http://wiki.fysik.dtu.dk/ase"
 arch=("any")
 license=('LGPLv2.1+')
 makedepends=('python-setuptools')
+depends=('python-numpy' 'python-scipy')
+optdepends=('python-matplotlib: plotting' 'python-flask: for ase.db web-interface')
 source=("https://gitlab.com/ase/ase/repository/archive.tar.gz?ref=$pkgver")
-md5sums=('1bee99e27e0ad510807626ba2d44e8a4')
-prepare() {
-    cp -a "${srcdir}/ase-$pkgver-$_sha"{,-py2}
-}
+md5sums=('7fcb2a6fde47fb509ea68c913efddf24')
 
-package_python-ase() {
-    depends=('python-numpy')
-    optdepends=('python-scipy: For extra functionality' 'python-matplotlib: 2D Plotting' 'pygtk: For ase.gui')
+package() {
     cd "$srcdir/ase-$pkgver-$_sha"
     python setup.py install --root="$pkgdir/" --optimize=1
 }
-
-package_python2-ase() {
-    depends=('python2-numpy')
-    optdepends=('python2-scipy: For extra functionality' 'python2-matplotlib: 2D Plotting' 'pygtk: For ase.gui')
-    cd "$srcdir/ase-$pkgver-$_sha-py2"
-    python2 setup.py install --root="$pkgdir/" --optimize=1
-    rename ase ase2 $pkgdir/usr/bin/*
-}