Update to v0.12.0-2

2 files changed, 108 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34175a324f47..c611f5a0a82d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,53 @@
 pkgbase = python-muranoclient
 	pkgdesc = Python client library for Murano
 	pkgver = 0.12.0
-	pkgrel = 1
-	url = http://docs.openstack.org/developer/python-muranoclient
+	pkgrel = 2
+	url = https://docs.openstack.org/developer/python-muranoclient/
 	arch = any
 	license = Apache
+	checkdepends = python-pbr
+	checkdepends = python2-pbr
+	checkdepends = python-prettytable
+	checkdepends = python2-prettytable
+	checkdepends = python-glanceclient
+	checkdepends = python2-glanceclient
+	checkdepends = python-keystoneclient
+	checkdepends = python2-keystoneclient
+	checkdepends = python-iso8601
+	checkdepends = python2-iso8601
+	checkdepends = python-babel
+	checkdepends = python2-babel
+	checkdepends = python-pyopenssl
+	checkdepends = python2-pyopenssl
+	checkdepends = python-requests
+	checkdepends = python2-requests
+	checkdepends = python-yaml
+	checkdepends = python2-yaml
+	checkdepends = python-yaql
+	checkdepends = python2-yaql
+	checkdepends = python-osc-lib
+	checkdepends = python2-osc-lib
+	checkdepends = python-oslo-serialization
+	checkdepends = python2-oslo-serialization
+	checkdepends = python-oslo-utils
+	checkdepends = python2-oslo-utils
+	checkdepends = python-oslo-log
+	checkdepends = python2-oslo-log
+	checkdepends = python-oslo-i18n
+	checkdepends = python2-oslo-i18n
+	checkdepends = python-muranopkgcheck
+	checkdepends = python2-muranopkgcheck
+	checkdepends = python-fixtures
+	checkdepends = python2-fixtures
+	checkdepends = python-mock
+	checkdepends = python2-mock
+	checkdepends = python-requests-mock
+	checkdepends = python2-requests-mock
+	checkdepends = python-testtools
+	checkdepends = python2-testtools
+	checkdepends = python-oslotest
+	checkdepends = python2-oslotest
+	makedepends = git
 	makedepends = python-setuptools
 	makedepends = python2-setuptools
 	source = git+https://git.openstack.org/openstack/python-muranoclient#tag=0.12.0
@@ -24,21 +67,23 @@ pkgname = python-muranoclient
 	depends = python-osc-lib
 	depends = python-oslo-serialization
 	depends = python-oslo-utils
+	depends = python-oslo-log
 	depends = python-oslo-i18n
 
 pkgname = python2-muranoclient
-	depends = python-pbr
-	depends = python-prettytable
-	depends = python-glanceclient
-	depends = python-keystoneclient
-	depends = python-iso8601
-	depends = python-babel
-	depends = python-pyopenssl
-	depends = python-requests
+	depends = python2-pbr
+	depends = python2-prettytable
+	depends = python2-glanceclient
+	depends = python2-keystoneclient
+	depends = python2-iso8601
+	depends = python2-babel
+	depends = python2-pyopenssl
+	depends = python2-requests
 	depends = python2-yaml
-	depends = python-yaql
-	depends = python-osc-lib
-	depends = python-oslo-serialization
-	depends = python-oslo-utils
-	depends = python-oslo-i18n
+	depends = python2-yaql
+	depends = python2-osc-lib
+	depends = python2-oslo-serialization
+	depends = python2-oslo-utils
+	depends = python2-oslo-log
+	depends = python2-oslo-i18n
 
diff --git a/PKGBUILD b/PKGBUILD
index 921591b08899..013bbbcd6093 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,41 +2,74 @@
 
 pkgname=('python-muranoclient' 'python2-muranoclient')
 pkgver='0.12.0'
-pkgrel='1'
+pkgrel='2'
 pkgdesc='Python client library for Murano'
 arch=('any')
-url='http://docs.openstack.org/developer/python-muranoclient'
+url="https://docs.openstack.org/developer/${pkgname}/"
 license=('Apache')
-makedepends=('python-setuptools' 'python2-setuptools')
-source=("git+https://git.openstack.org/openstack/python-muranoclient#tag=$pkgver")
+makedepends=('git' 'python-setuptools' 'python2-setuptools')
+checkdepends=('python-pbr' 'python2-pbr'
+              'python-prettytable' 'python2-prettytable'
+              'python-glanceclient' 'python2-glanceclient'
+              'python-keystoneclient' 'python2-keystoneclient'
+              'python-iso8601' 'python2-iso8601'
+              'python-babel' 'python2-babel'
+              'python-pyopenssl' 'python2-pyopenssl'
+              'python-requests' 'python2-requests'
+              'python-yaml' 'python2-yaml'
+              'python-yaql' 'python2-yaql'
+              'python-osc-lib' 'python2-osc-lib'
+              'python-oslo-serialization' 'python2-oslo-serialization'
+              'python-oslo-utils' 'python2-oslo-utils'
+              'python-oslo-log' 'python2-oslo-log'
+              'python-oslo-i18n' 'python2-oslo-i18n'
+              'python-muranopkgcheck' 'python2-muranopkgcheck'
+              'python-fixtures' 'python2-fixtures'
+              'python-mock' 'python2-mock'
+              'python-requests-mock' 'python2-requests-mock'
+              'python-testtools' 'python2-testtools'
+              'python-oslotest' 'python2-oslotest')
+source=("git+https://git.openstack.org/openstack/${pkgname}#tag=${pkgver}")
 sha256sums=('SKIP')
 
 prepare() {
-  cp -a python-muranoclient{,-py2}
+  cp -a "${srcdir}/${pkgname}"{,-py2}
 }
 
 build() {
-  cd "$srcdir"/python-muranoclient
+  cd "${srcdir}/${pkgname}"
   python setup.py build
 
-  cd "$srcdir"/python-muranoclient-py2
+  cd "${srcdir}/${pkgname}-py2"
   python2 setup.py build
 }
 
+check() {
+  cd "${srcdir}/${pkgname}"
+  # Fix test function name for Python 3
+  sed -i 's/assertItemsEqual/assertCountEqual/g' muranoclient/tests/unit/osc/v1/*.py
+  python setup.py testr
+
+  cd "${srcdir}/${pkgname}-py2"
+  PYTHON=python2 python2 setup.py testr
+}
+
 package_python-muranoclient() {
-  depends=('python-pbr' 'python-prettytable' 'python-glanceclient' 'python-keystoneclient'
-           'python-iso8601' 'python-babel' 'python-pyopenssl' 'python-requests'
-           'python-yaml' 'python-yaql' 'python-osc-lib' 'python-oslo-serialization'
-           'python-oslo-utils' 'python-oslo-i18n')
+  depends=('python-pbr' 'python-prettytable' 'python-glanceclient'
+           'python-keystoneclient' 'python-iso8601' 'python-babel'
+           'python-pyopenssl' 'python-requests' 'python-yaml' 'python-yaql'
+           'python-osc-lib' 'python-oslo-serialization' 'python-oslo-utils'
+           'python-oslo-log' 'python-oslo-i18n')
   cd "${srcdir}/${pkgname}"
   python setup.py install --root="${pkgdir}" --optimize=1
 }
 
 package_python2-muranoclient() {
-  depends=('python-pbr' 'python-prettytable' 'python-glanceclient' 'python-keystoneclient'
-           'python-iso8601' 'python-babel' 'python-pyopenssl' 'python-requests'
-           'python2-yaml' 'python-yaql' 'python-osc-lib' 'python-oslo-serialization'
-           'python-oslo-utils' 'python-oslo-i18n')
+  depends=('python2-pbr' 'python2-prettytable' 'python2-glanceclient'
+           'python2-keystoneclient' 'python2-iso8601' 'python2-babel'
+           'python2-pyopenssl' 'python2-requests' 'python2-yaml' 'python2-yaql'
+           'python2-osc-lib' 'python2-oslo-serialization' 'python2-oslo-utils'
+           'python2-oslo-log' 'python2-oslo-i18n')
   cd "${srcdir}/python-muranoclient-py2"
   python2 setup.py install --root="${pkgdir}" --optimize=1
   mv "${pkgdir}"/usr/bin/murano{,2}