Update to v1.17.0-3 and drop Py2

2 files changed, 31 insertions, 143 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6011095cab8..025b4bac0fb3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,59 +1,18 @@
 pkgbase = python-heatclient
 	pkgdesc = Python client library for Heat
 	pkgver = 1.17.0
-	pkgrel = 1
-	url = http://docs.openstack.org/developer/python-heatclient/
+	pkgrel = 3
+	url = https://docs.openstack.org/python-heatclient/
 	arch = any
 	license = Apache
-	checkdepends = python-babel
-	checkdepends = python2-babel
-	checkdepends = python-pbr
-	checkdepends = python2-pbr
-	checkdepends = python-cliff
-	checkdepends = python2-cliff
-	checkdepends = python-iso8601
-	checkdepends = python-iso8601
-	checkdepends = python-osc-lib
-	checkdepends = python2-osc-lib
-	checkdepends = python-prettytable
-	checkdepends = python2-prettytable
-	checkdepends = python-oslo-i18n
-	checkdepends = python2-oslo-i18n
-	checkdepends = python-oslo-serialization
-	checkdepends = python2-oslo-serialization
-	checkdepends = python-oslo-utils
-	checkdepends = python2-oslo-utils
-	checkdepends = python-keystoneauth1
-	checkdepends = python2-keystoneauth1
-	checkdepends = python-swiftclient
-	checkdepends = python2-swiftclient
-	checkdepends = python-yaml
-	checkdepends = python2-yaml
-	checkdepends = python-requests
-	checkdepends = python2-requests
-	checkdepends = python-six
-	checkdepends = python2-six
-	checkdepends = python-openstackclient
-	checkdepends = python2-openstackclient
-	checkdepends = python-requests
-	checkdepends = python2-requests
-	checkdepends = python-six
-	checkdepends = python2-six
-	checkdepends = python-mock
-	checkdepends = python2-mock
-	checkdepends = python-oslotest
-	checkdepends = python2-oslotest
-	checkdepends = python-os-testr
+	checkdepends = python-fixtures
 	checkdepends = python-requests-mock
-	checkdepends = python2-requests-mock
+	checkdepends = python-mock
+	checkdepends = python-openstackclient
+	checkdepends = python-stestr
 	checkdepends = python-testrepository
-	checkdepends = python2-testrepository
-	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	source = https://github.com/openstack/python-heatclient/archive/1.17.0.tar.gz
-	sha512sums = fb16f17e1313d1897291fdb4f72641a5e288283a96d88813421f12546e540ffe3a184cd0ec39f9f5acf9aa2f036dc3449ead0269b916c571ee1ec00c152202f9
-
-pkgname = python-heatclient
+	checkdepends = python-testscenarios
+	checkdepends = python-mox3
 	depends = python-babel
 	depends = python-pbr
 	depends = python-cliff
@@ -68,20 +27,9 @@ pkgname = python-heatclient
 	depends = python-yaml
 	depends = python-requests
 	depends = python-six
+	depends = python-openstackclient
+	source = https://github.com/openstack/python-heatclient/archive/1.17.0.tar.gz
+	sha512sums = fb16f17e1313d1897291fdb4f72641a5e288283a96d88813421f12546e540ffe3a184cd0ec39f9f5acf9aa2f036dc3449ead0269b916c571ee1ec00c152202f9
 
-pkgname = python2-heatclient
-	depends = python2-babel
-	depends = python2-pbr
-	depends = python2-cliff
-	depends = python2-iso8601
-	depends = python2-osc-lib
-	depends = python2-prettytable
-	depends = python2-oslo-i18n
-	depends = python2-oslo-serialization
-	depends = python2-oslo-utils
-	depends = python2-keystoneauth1
-	depends = python2-swiftclient
-	depends = python2-yaml
-	depends = python2-requests
-	depends = python2-six
+pkgname = python-heatclient
 
diff --git a/PKGBUILD b/PKGBUILD
index 00184d7457c5..62e4cc8a843f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,98 +1,38 @@
 # Maintainer: Andy Botting <andy@andybotting.com>
 
-pkgname=('python-heatclient'
-         'python2-heatclient')
-pkgver='1.17.0'
-pkgrel='1'
+pkgname=python-heatclient
+pkgver=1.17.0
+pkgrel=3
 pkgdesc='Python client library for Heat'
 arch=('any')
-url="http://docs.openstack.org/developer/${pkgname}/"
+url="https://docs.openstack.org/$pkgname/"
 license=('Apache')
-makedepends=('python-setuptools'
-             'python2-setuptools')
-checkdepends=('python-babel' 'python2-babel' 
-              'python-pbr' 'python2-pbr'
-              'python-cliff' 'python2-cliff'
-              'python-iso8601' 'python-iso8601'
-              'python-osc-lib' 'python2-osc-lib'
-              'python-prettytable' 'python2-prettytable'
-              'python-oslo-i18n' 'python2-oslo-i18n'
-              'python-oslo-serialization' 'python2-oslo-serialization'
-              'python-oslo-utils' 'python2-oslo-utils'
-              'python-keystoneauth1' 'python2-keystoneauth1'
-              'python-swiftclient' 'python2-swiftclient'
-              'python-yaml' 'python2-yaml'
-              'python-requests' 'python2-requests'
-              'python-six' 'python2-six'
-              'python-openstackclient' 'python2-openstackclient'
-              'python-requests' 'python2-requests'
-              'python-six' 'python2-six'
-              'python-mock' 'python2-mock'
-              'python-oslotest' 'python2-oslotest'
-              'python-os-testr'
-              'python-requests-mock' 'python2-requests-mock'
-              'python-testrepository' 'python2-testrepository')
-source=("https://github.com/openstack/${pkgname}/archive/${pkgver}.tar.gz")
+depends=('python-babel' 'python-pbr' 'python-cliff' 'python-iso8601'
+         'python-osc-lib' 'python-prettytable' 'python-oslo-i18n'
+         'python-oslo-serialization' 'python-oslo-utils'
+         'python-keystoneauth1' 'python-swiftclient' 'python-yaml'
+         'python-requests' 'python-six' 'python-openstackclient')
+checkdepends=('python-fixtures' 'python-requests-mock' 'python-mock'
+              'python-openstackclient' 'python-stestr' 'python-testrepository'
+              'python-testscenarios' 'python-mox3')
+source=("https://github.com/openstack/$pkgname/archive/$pkgver.tar.gz")
 sha512sums=('fb16f17e1313d1897291fdb4f72641a5e288283a96d88813421f12546e540ffe3a184cd0ec39f9f5acf9aa2f036dc3449ead0269b916c571ee1ec00c152202f9')
 
-prepare() {
-  cp -a "${srcdir}/${pkgname}-${pkgver}"{,-py2}
-  export PBR_VERSION=$pkgver
-}
+export PBR_VERSION=$pkgver
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   python setup.py build
-
-  cd "${srcdir}/${pkgname}-${pkgver}-py2"
-  python2 setup.py build
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   stestr run
-
-  cd "${srcdir}/${pkgname}-${pkgver}-py2"
-  PYTHON=python2 stestr2 run
-}
-
-package_python-heatclient() {
-  depends=('python-babel'
-           'python-pbr' 
-           'python-cliff'
-           'python-iso8601'
-           'python-osc-lib'
-           'python-prettytable'
-           'python-oslo-i18n'
-           'python-oslo-serialization' 
-           'python-oslo-utils'
-           'python-keystoneauth1'
-           'python-swiftclient'
-           'python-yaml'
-           'python-requests'
-           'python-six')
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  python setup.py install --root="${pkgdir}" --optimize=1
 }
 
-package_python2-heatclient() {
-  depends=('python2-babel'
-           'python2-pbr' 
-           'python2-cliff'
-           'python2-iso8601'
-           'python2-osc-lib'
-           'python2-prettytable'
-           'python2-oslo-i18n'
-           'python2-oslo-serialization' 
-           'python2-oslo-utils'
-           'python2-keystoneauth1'
-           'python2-swiftclient'
-           'python2-yaml'
-           'python2-requests'
-           'python2-six')
-  cd "${srcdir}/python-heatclient-${pkgver}-py2"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  mv "${pkgdir}"/usr/bin/heat{,2}
+package() {
+  cd $pkgname-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1
 }
 
 # vim:set ts=2 sw=2 et: