Update to 0.19.0

2 files changed, 22 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 333e5fdace41..9a58aaa0dd78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,13 @@
 pkgbase = python-toyplot
-	pkgdesc = modern Python plotting toolkit supporting electronic publishing and reproducibility
-	pkgver = 0.18.0
+	pkgdesc = Python plotting toolkit supporting electronic publishing and reproducibility
+	pkgver = 0.19.0
 	pkgrel = 1
 	url = http://toyplot.readthedocs.io/
 	arch = any
 	license = custom:sandia
 	makedepends = python
 	makedepends = python-setuptools
-	makedepends = python2
-	makedepends = python2-setuptools
-	options = !emptydirs
-	source = python-toyplot-0.18.0.tar.gz::https://pypi.io/packages/source/t/toyplot/toyplot-0.18.0.tar.gz
-	source = https://raw.githubusercontent.com/sandialabs/toyplot/89a17d4b4ab39e7d02383426264119f523540859/LICENSE
-	sha256sums = f3c07ed64609fa8747210421717b241c808da2fc5d296615c83bf422faca9e90
-	sha256sums = 3f2c149ada89dc7874788fc3aee58ba5a1849fb2f44ba722f6a0a314b401c31f
-
-pkgname = python-toyplot
+	makedepends = git
 	depends = python
 	depends = python-arrow
 	depends = python-custom_inherit
@@ -23,13 +15,9 @@ pkgname = python-toyplot
 	depends = python-numpy
 	depends = python-reportlab
 	depends = python-six
+	options = !emptydirs
+	source = git+https://github.com/sandialabs/toyplot#tag=v0.19.0
+	sha256sums = SKIP
 
-pkgname = python2-toyplot
-	depends = python2
-	depends = python2-arrow
-	depends = python2-custom_inherit
-	depends = python2-multipledispatch
-	depends = python2-numpy
-	depends = python2-reportlab
-	depends = python2-six
+pkgname = python-toyplot
 
diff --git a/PKGBUILD b/PKGBUILD
index 2e770a7d7c6d..c1621cb96dcf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,30 @@
 # Contributor: Lex Black <autumn-wind@web.de>
 # Contributor: Clint Valentine <valentine.clint@gmail.com>
+# Maintainer: Nathan Owens <ndowens @ artixlinux.org>
 
-_name=toyplot
-pkgbase='python-toyplot'
-pkgname=('python-toyplot' 'python2-toyplot')
-pkgver=0.18.0
+pkgname=('python-toyplot')
+pkgver=0.19.0
 pkgrel=1
-pkgdesc="modern Python plotting toolkit supporting electronic publishing and reproducibility"
+pkgdesc="Python plotting toolkit supporting electronic publishing and reproducibility"
 arch=('any')
 url="http://toyplot.readthedocs.io/"
 license=('custom:sandia')
-makedepends=('python' 'python-setuptools'
-             'python2' 'python2-setuptools')
+depends=('python' 'python-arrow' 'python-custom_inherit'
+         'python-multipledispatch' 'python-numpy'
+         'python-reportlab' 'python-six')
+makedepends=('python' 'python-setuptools' 'git')
 options=(!emptydirs)
-source=("${pkgname}"-"${pkgver}".tar.gz::https://pypi.io/packages/source/"${_name:0:1}"/"${_name}"/"${_name}"-"${pkgver}".tar.gz
-        https://raw.githubusercontent.com/sandialabs/toyplot/89a17d4b4ab39e7d02383426264119f523540859/LICENSE)
-sha256sums=('f3c07ed64609fa8747210421717b241c808da2fc5d296615c83bf422faca9e90'
-            '3f2c149ada89dc7874788fc3aee58ba5a1849fb2f44ba722f6a0a314b401c31f')
-
-
-prepare() {
-  cp -a toyplot-"${pkgver}"{,-py2}
-}
+source=("git+https://github.com/sandialabs/toyplot#tag=v${pkgver}")
+sha256sums=('SKIP')
 
 build(){
-  cd "${srcdir}"/toyplot-"${pkgver}"
+  cd "${srcdir}/toyplot"
   python setup.py build
-
-  cd "${srcdir}"/toyplot-"${pkgver}"-py2
-  python2 setup.py build
-}
-
-package_python2-toyplot() {
-  depends=('python2' 'python2-arrow' 'python2-custom_inherit'
-           'python2-multipledispatch' 'python2-numpy'
-           'python2-reportlab' 'python2-six')
-
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE
-  cd toyplot-"${pkgver}"-py2
-  python2 setup.py install --root="${pkgdir}"/ --optimize=1 --skip-build
 }
 
-package_python-toyplot() {
-  depends=('python' 'python-arrow' 'python-custom_inherit'
-           'python-multipledispatch' 'python-numpy'
-           'python-reportlab' 'python-six')
+package() {
+  cd "${srcdir}/toyplot"
+  python setup.py install --root="${pkgdir}"/ --optimize=1
 
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE
-  cd toyplot-"${pkgver}"
-  python setup.py install --root="${pkgdir}"/ --optimize=1 --skip-build
+  install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }