Drop python2 support

3 files changed, 22 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e493f3b15996..86a25330b838 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,14 @@
 pkgbase = python-duckling
 	pkgdesc = Python wrapper for wit.ai's Duckling Clojure library
 	pkgver = 1.8.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/FraBle/python-duckling
 	arch = any
-	license = APACHE
-	makedepends = python
-	makedepends = python-setuptools
-	makedepends = python2
-	makedepends = python2-setuptools
-	source = python-duckling-1.8.0.tar.gz::https://github.com/FraBle/python-duckling/archive/v1.8.0.tar.gz
-	sha512sums = 9aa59d55cd546b977d86987c68676d3ed38d2a902d74bd67960c23e5f8d4a41e893f3ef495d15862a9b18cc839a1fce07f490caa96c5a3f6a86ffcf4e69f27fa
-
-pkgname = python-duckling
-	depends = python
+	license = Apache
+	makedepends = python-pytest-runner
 	depends = java-environment
 	depends = python-jpype1
+	source = https://github.com/FraBle/python-duckling/archive/v1.8.0.tar.gz
+	sha512sums = 9aa59d55cd546b977d86987c68676d3ed38d2a902d74bd67960c23e5f8d4a41e893f3ef495d15862a9b18cc839a1fce07f490caa96c5a3f6a86ffcf4e69f27fa
 
-pkgname = python2-duckling
-	depends = python2
-	depends = java-environment
-	depends = python2-jpype1
-
+pkgname = python-duckling
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..f59ec20aabf5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 6cc30aa52d1b..493cb958403b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,23 @@
-# Maintainer: NicoHood <archlinux {cat} nicohood {dog} de>
-# PGP ID: 97312D5EB9D7AE7D0BD4307351DAE9B7C1AE9161
-
-_pkgname=python-duckling
-pkgbase=python-duckling
-pkgname=('python-duckling' 'python2-duckling')
+# Contributor: NicoHood <archlinux {cat} nicohood {dog} de>
+pkgname=python-duckling
 pkgdesc="Python wrapper for wit.ai's Duckling Clojure library"
 pkgver=1.8.0
-pkgrel=1
-url="https://github.com/FraBle/python-duckling"
-license=('APACHE')
+pkgrel=2
+url="https://github.com/FraBle/${pkgname}"
+license=('Apache')
 arch=("any")
-makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools')
-source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/FraBle/${_pkgname}/archive/v${pkgver}.tar.gz")
+depends=(java-environment python-jpype1)
+makedepends=(python-pytest-runner)
+source=(${url}/archive/v${pkgver}.tar.gz)
 sha512sums=('9aa59d55cd546b977d86987c68676d3ed38d2a902d74bd67960c23e5f8d4a41e893f3ef495d15862a9b18cc839a1fce07f490caa96c5a3f6a86ffcf4e69f27fa')
-#validpgpkeys=('') # TODO
 
-prepare() {
-    # Create a copy for the python2 package
-    cp -r "${_pkgname}-${pkgver}" "python2-${_pkgname}-${pkgver}"
+build() {
+  cd "${pkgname}-${pkgver}"
+  python setup.py build
 }
 
-package_python-duckling() {
-    depends=('python' 'java-environment' 'python-jpype1')
-
-    cd "${srcdir}/${_pkgname}-${pkgver}"
-    python setup.py install --root="${pkgdir}" --optimize=1
-}
-
-package_python2-duckling() {
-    depends=('python2' 'java-environment' 'python2-jpype1')
-
-    cd "${srcdir}/python2-${_pkgname}-${pkgver}"
-    python2 setup.py install --root="${pkgdir}" --optimize=1
+package() {
+  cd "${pkgname}-${pkgver}"
+  export PYTHONHASHSEED=0
+  PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
 }