switch to Python 3, now that `python-hidapi` is available

2 files changed, 34 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ee98993e9564..a7bb71f0bcbd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,24 @@
 pkgbase = plover-git
 	pkgdesc = Free and open source real-time stenography engine.
-	pkgver = 4.0.0.dev0.44.gdcf0425
-	pkgrel = 2
+	pkgver = 4.0.0.dev0.144.gded92d7
+	pkgrel = 1
 	url = http://www.openstenoproject.org/plover/
 	arch = any
 	license = GPL2
 	makedepends = git
-	makedepends = python2-babel
-	makedepends = python2-mock
-	makedepends = python2-pytest
-	makedepends = python2-setuptools-scm
-	depends = python2
-	depends = python2-appdirs
-	depends = python2-dbus
-	depends = python2-hidapi
-	depends = python2-pyqt5
-	depends = python2-pyserial
-	depends = python2-setuptools
-	depends = python2-six
-	depends = python2-xlib
+	makedepends = python-babel
+	makedepends = python-mock
+	makedepends = python-pytest
+	makedepends = python-setuptools-scm
+	depends = python
+	depends = python-appdirs
+	depends = python-dbus
+	depends = python-hidapi
+	depends = python-pyqt5
+	depends = python-pyserial
+	depends = python-setuptools
+	depends = python-six
+	depends = python-xlib
 	depends = wmctrl
 	provides = plover
 	conflicts = plover-git
diff --git a/PKGBUILD b/PKGBUILD
index 51c4771dd820..1246baa54ac3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,28 @@
 
 pkgname=plover-git
 pkgdesc="Free and open source real-time stenography engine."
-pkgver=4.0.0.dev0.44.gdcf0425
-pkgrel=2
+pkgver=4.0.0.dev0.144.gded92d7
+pkgrel=1
 arch=('any')
 license=('GPL2')
 depends=(
-  'python2'
-  'python2-appdirs'
-  'python2-dbus'
-  'python2-hidapi'
-  'python2-pyqt5'
-  'python2-pyserial'
-  'python2-setuptools'
-  'python2-six'
-  'python2-xlib'
+  'python'
+  'python-appdirs'
+  'python-dbus'
+  'python-hidapi'
+  'python-pyqt5'
+  'python-pyserial'
+  'python-setuptools'
+  'python-six'
+  'python-xlib'
   'wmctrl'
 )
 makedepends=(
   'git'
-  'python2-babel'
-  'python2-mock'
-  'python2-pytest'
-  'python2-setuptools-scm'
+  'python-babel'
+  'python-mock'
+  'python-pytest'
+  'python-setuptools-scm'
 )
 provides=('plover')
 conflicts=('plover-git')
@@ -33,27 +33,26 @@ sha1sums=(SKIP)
 
 pkgver() {
   cd "$pkgname"
-  python2 setup.py patch_version | sed -n '/^patching version to /{s///;s/+/./;p;Q0};${Q1}'
+  python setup.py patch_version | sed -n '/^patching version to /{s///;s/+/./;p;Q0};${Q1}'
 }
 
 prepare() {
   cd "$pkgname"
-  sed -e 's/"py\(rcc\|uic\)5"/"python2-py\15"/' -i pyuic.json
 }
 
 build() {
   cd "$pkgname"
-  PYTHONPATH="$(echo -n .eggs/pyqt_distutils-*.egg)" python2 setup.py build
+  PYTHONPATH="$(echo -n .eggs/pyqt_distutils-*.egg)" python setup.py build
 }
 
 check() {
   cd "$pkgname"
-  python2 setup.py test
+  python setup.py test
 }
 
 package() {
   cd "$pkgname"
-  python2 setup.py install --root="$pkgdir"
+  python setup.py install --root="$pkgdir"
   chmod og+rX -R "$pkgdir"
 }