Use Python 3 instead of Python 2

Requires switching from the original cheetah to the cheetah3 fork, which
is only available in AUR. Also, ditch oauth dependency, looks like
cloud-init only imports oauthlib.

2 files changed, 21 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 198222ef7f69..c76d4d5dc78b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,25 +5,24 @@ pkgbase = cloud-init
 	url = https://cloud-init.io
 	arch = any
 	license = GPL3
-	makedepends = python2
-	makedepends = python2-setuptools
+	makedepends = python
+	makedepends = python-setuptools
 	makedepends = pkgconf
 	depends = systemd
 	depends = sudo
-	depends = python2-yaml
-	depends = python2-cheetah
-	depends = python2-prettytable
-	depends = python2-oauth
-	depends = python2-boto
-	depends = python2-configobj
-	depends = python2-jsonschema
-	depends = python2-jsonpatch
-	depends = python2-jsonpointer
+	depends = python-yaml
+	depends = python-cheetah3
+	depends = python-prettytable
+	depends = python-boto
+	depends = python-configobj
+	depends = python-jsonschema
+	depends = python-jsonpatch
+	depends = python-jsonpointer
 	depends = net-tools
-	depends = python2-requests
-	depends = python2-argparse
-	depends = python2-oauthlib
-	depends = python2-jinja
+	depends = python-requests
+	depends = python-argparse
+	depends = python-oauthlib
+	depends = python-jinja
 	depends = dhclient
 	backup = etc/cloud/cloud.cfg
 	backup = etc/cloud/cloud.cfg.d/05_logging.cfg
diff --git a/PKGBUILD b/PKGBUILD
index ffba8aa99617..1fe2b3489ef3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,12 +10,12 @@ pkgdesc="The standard for customising cloud instances"
 arch=('any')
 url="https://cloud-init.io"
 license=('GPL3')
-depends=('systemd' 'sudo' 'python2-yaml' 'python2-cheetah' 'python2-prettytable'
-         'python2-oauth' 'python2-boto' 'python2-configobj'
-         'python2-jsonschema' 'python2-jsonpatch' 'python2-jsonpointer' 'net-tools'
-         'python2-requests' 'python2-argparse' 'python2-oauthlib'
-         'python2-jinja' 'dhclient')
-makedepends=('python2' 'python2-setuptools' 'pkgconf')
+depends=('systemd' 'sudo' 'python-yaml' 'python-cheetah3' 'python-prettytable'
+         'python-boto' 'python-configobj'
+         'python-jsonschema' 'python-jsonpatch' 'python-jsonpointer' 'net-tools'
+         'python-requests' 'python-argparse' 'python-oauthlib'
+         'python-jinja' 'dhclient')
+makedepends=('python' 'python-setuptools' 'pkgconf')
 backup=('etc/cloud/cloud.cfg' 'etc/cloud/cloud.cfg.d/05_logging.cfg')
 source=("https://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz"
         fix-lib.patch
@@ -29,15 +29,13 @@ prepare(){
 
   patch -Np1 -i ../fix-lib.patch
 
-  find . -name \*.py -exec sed -i '1s/python$/&2/' {} +
-  sed -i '1s/python$/&2/' tools/read*
   sed -e 's:/etc/systemd:/usr/lib/systemd:g' -e 's:\"/lib\":\"/usr/lib\":g' -i setup.py
 }
 
 package() {
   cd $pkgname-$pkgver
 
-  python2 ./setup.py install --root="$pkgdir" --init-system systemd
+  python ./setup.py install --root="$pkgdir" --init-system systemd
 
   install -m644 ../archlinux.cloud.cfg "$pkgdir"/etc/cloud/cloud.cfg
 }