Update to v1.12.0

3 files changed, 144 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 78ea1b600cab..ef8fe80e1c6b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,70 @@
-# Generated by mksrcinfo v8
-# Tue Oct 11 10:42:08 UTC 2016
 pkgbase = python-heatclient
 	pkgdesc = Python client library for Heat
-	pkgver = 1.5.0
+	pkgver = 1.12.0
 	pkgrel = 1
-	url = https://launchpad.net/python-heatclient
+	url = http://docs.openstack.org/developer/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-requests-mock
+	checkdepends = python2-requests-mock
+	checkdepends = python-testrepository
+	checkdepends = python2-testrepository
+	makedepends = git
 	makedepends = python-setuptools
 	makedepends = python2-setuptools
-	source = https://github.com/openstack/python-heatclient/archive/1.5.0.tar.gz
-	sha256sums = c67c75547636552afd28a6788d5adb54de926663361fdf63126ea9b7db831178
+	source = git+https://git.openstack.org/openstack/python-heatclient#tag=1.12.0
+	md5sums = SKIP
 
 pkgname = python-heatclient
 	depends = python-babel
 	depends = python-pbr
+	depends = python-cliff
 	depends = python-iso8601
+	depends = python-osc-lib
 	depends = python-prettytable
 	depends = python-oslo-i18n
 	depends = python-oslo-serialization
 	depends = python-oslo-utils
-	depends = python-keystoneclient
+	depends = python-keystoneauth1
 	depends = python-swiftclient
 	depends = python-yaml
 	depends = python-requests
@@ -29,12 +73,14 @@ pkgname = python-heatclient
 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-keystoneclient
+	depends = python2-keystoneauth1
 	depends = python2-swiftclient
 	depends = python2-yaml
 	depends = python2-requests
diff --git a/.gitignore b/.gitignore
index 3317ac6609e8..05c6d4d4c97b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-/pkg/
-/src/
-/*.tar.*
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index 48e2fc5cc985..e7c893c7687e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,97 @@
-# Maintainer: Christoph Gysin <christoph.gysin@gmail.com>
+# Maintainer: Andy Botting <andy@andybotting.com>
 
 pkgname=('python-heatclient'
          'python2-heatclient')
-pkgver='1.5.0'
+pkgver='1.12.0'
 pkgrel='1'
 pkgdesc='Python client library for Heat'
 arch=('any')
-url='https://launchpad.net/python-heatclient'
+url="http://docs.openstack.org/developer/${pkgname}/"
 license=('Apache')
-makedepends=('python-setuptools'
+makedepends=('git'
+             'python-setuptools'
              'python2-setuptools')
-source=("https://github.com/openstack/python-heatclient/archive/${pkgver}.tar.gz")
-sha256sums=('c67c75547636552afd28a6788d5adb54de926663361fdf63126ea9b7db831178')
-
-package_python-heatclient()
-{
-    depends=('python-babel'
-             'python-pbr'
-             'python-iso8601'
-             'python-prettytable'
-             'python-oslo-i18n'
-             'python-oslo-serialization'
-             'python-oslo-utils'
-             'python-keystoneclient'
-             'python-swiftclient'
-             'python-yaml'
-             'python-requests'
-             'python-six')
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    python setup.py \
-        install \
-            --root="${pkgdir}" \
-            --optimize=1
+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=("git+https://git.openstack.org/openstack/${pkgname}#tag=${pkgver}")
+md5sums=('SKIP')
+
+prepare() {
+  cp -a "${srcdir}/${pkgname}"{,-py2}
+}
+
+build() {
+  cd "${srcdir}/${pkgname}"
+  python setup.py build
+
+  cd "${srcdir}/${pkgname}-py2"
+  python2 setup.py build
+}
+
+check() {
+  cd "${srcdir}/${pkgname}"
+  python setup.py testr
+
+  cd "${srcdir}/${pkgname}-py2"
+  PYTHON=python2 python2 setup.py testr
 }
 
-package_python2-heatclient()
-{
-    depends=('python2-babel'
-             'python2-pbr'
-             'python2-iso8601'
-             'python2-prettytable'
-             'python2-oslo-i18n'
-             'python2-oslo-serialization'
-             'python2-oslo-utils'
-             'python2-keystoneclient'
-             'python2-swiftclient'
-             'python2-yaml'
-             'python2-requests'
-             'python2-six')
-    makedepends=('python2-setuptools')
-    cd "${srcdir}/python-heatclient-${pkgver}"
-    python2 setup.py \
-        install \
-            --root="${pkgdir}" \
-            --optimize=1
-    mv "${pkgdir}"/usr/bin/heat{,2}
+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}"
+  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-py2"
+  python2 setup.py install --root="${pkgdir}" --optimize=1
+}
+
+# vim:set ts=2 sw=2 et: