Change to Python 3 only

Change source URL from git:// to git+https://
Remove python-setuptools

2 files changed, 18 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e98b74f940c4..e9c1b791eb6e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,17 @@
-pkgbase = python-spyder-kernels-git
-	pkgver = 1.0.1.r1.g5c33e3a
+pkgbase = python-spyder-kernels
+	pkgdesc = Jupyter Kernels for the Spyder console
+	pkgver = 1.8.1.r1.gb713289
 	pkgrel = 1
 	url = https://github.com/spyder-ide/spyder-kernels
 	arch = any
 	license = MIT
 	makedepends = git
-	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	source = python2-spyder-kernels::git://github.com/spyder-ide/spyder-kernels.git
-	md5sums = SKIP
-
-pkgname = python-spyder-kernels-git
-	pkgdesc = Spyder console Jupyter kernels
 	depends = python-cloudpickle
 	depends = python-ipykernel
 	provides = python-spyder-kernels
 	conflicts = python-spyder-kernels
+	source = python-spyder-kernels::git+https://github.com/spyder-ide/spyder-kernels.git
+	md5sums = SKIP
 
-pkgname = python2-spyder-kernels-git
-	pkgdesc = Spyder console Jupyter kernels
-	depends = python2-cloudpickle
-	depends = python2-ipykernel
-	provides = python2-spyder-kernels
-	conflicts = python2-spyder-kernels
+pkgname = python-spyder-kernels
 
diff --git a/PKGBUILD b/PKGBUILD
index 1e3c8d048c3a..b198f36078da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,31 @@
 # Maintainer: willemw <willemw12@gmail.com>
 
-_pkgname2=python2-spyder-kernels
-_pkgname3=python-spyder-kernels
-pkgbase=$_pkgname3-git
-pkgname=($_pkgname3-git $_pkgname2-git)
-pkgver=1.0.1.r1.g5c33e3a
+pkgname=python-spyder-kernels
+pkgver=1.8.1.r1.gb713289
 pkgrel=1
+pkgdesc="Jupyter Kernels for the Spyder console"
 arch=('any')
 url="https://github.com/spyder-ide/spyder-kernels"
 license=('MIT')
-makedepends=('git' 'python-setuptools' 'python2-setuptools')
-source=($_pkgname2::git://github.com/spyder-ide/spyder-kernels.git)
+depends=('python-cloudpickle' 'python-ipykernel')
+makedepends=('git')
+provides=(${pkgname%-git})
+conflicts=(${pkgname%-git})
+source=($pkgname::git+$url.git)
 md5sums=('SKIP')
 
 pkgver() {
-  cd $_pkgname2
+  cd $pkgname
   git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 } 
 
-prepare() {
-  rm -rf $_pkgname3
-  cp -a $_pkgname2 $_pkgname3
-}
-
 build() {
-  cd "$srcdir/$_pkgname2"
-  python2 setup.py build
-
-  cd "$srcdir/$_pkgname3"
+  cd $pkgname
   python setup.py build
 }
 
-package_python2-spyder-kernels-git() {
-  pkgdesc="Spyder console Jupyter kernels"
-  depends=('python2-cloudpickle' 'python2-ipykernel')
-  provides=($_pkgname2)
-  conflicts=($_pkgname2)
-
-  cd $_pkgname2
-  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-}
-
-package_python-spyder-kernels-git() {
-  pkgdesc="Spyder console Jupyter kernels"
-  depends=('python-cloudpickle' 'python-ipykernel')
-  provides=($_pkgname3)
-  conflicts=($_pkgname3)
-
-  cd $_pkgname3
+package() {
+  cd $pkgname
   python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 }