Update to v1.2.0-2 and drop Py2

2 files changed, 30 insertions, 120 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e4a59b9858b7..2a1ae0025058 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,89 +1,38 @@
 pkgbase = python-muranoclient
 	pkgdesc = Python client library for Murano
 	pkgver = 1.2.0
-	pkgrel = 1
-	url = https://docs.openstack.org/developer/python-muranoclient/
+	pkgrel = 2
+	url = https://docs.openstack.org/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-tempest
+	checkdepends = python-stestr
+	checkdepends = python-testscenarios
 	checkdepends = python-testtools
-	checkdepends = python2-testtools
 	checkdepends = python-oslotest
-	checkdepends = python2-oslotest
-	makedepends = git
-	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	source = https://github.com/openstack/python-muranoclient/archive/1.2.0.tar.gz
-	sha512sums = 6c8281a694b637d73a48e4f2f81b515c97ffc7a0432a2653258690b31ceb72d1a1793462d61901c628bd2699c0fbbbd6beaf9b1257bd2f9a9114103dd06c5434
-
-pkgname = python-muranoclient
+	checkdepends = python-os-testr
 	depends = python-pbr
 	depends = python-prettytable
 	depends = python-glanceclient
 	depends = python-keystoneclient
 	depends = python-iso8601
+	depends = python-six
 	depends = python-babel
 	depends = python-pyopenssl
 	depends = python-requests
 	depends = python-yaml
 	depends = python-yaql
 	depends = python-osc-lib
+	depends = python-muranopkgcheck
 	depends = python-oslo-serialization
 	depends = python-oslo-utils
 	depends = python-oslo-log
 	depends = python-oslo-i18n
+	source = https://github.com/openstack/python-muranoclient/archive/1.2.0.tar.gz
+	sha512sums = 6c8281a694b637d73a48e4f2f81b515c97ffc7a0432a2653258690b31ceb72d1a1793462d61901c628bd2699c0fbbbd6beaf9b1257bd2f9a9114103dd06c5434
 
-pkgname = python2-muranoclient
-	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 = python2-yaql
-	depends = python2-osc-lib
-	depends = python2-oslo-serialization
-	depends = python2-oslo-utils
-	depends = python2-oslo-log
-	depends = python2-oslo-i18n
+pkgname = python-muranoclient
 
diff --git a/PKGBUILD b/PKGBUILD
index 4d0334670253..db70e3a4e3c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,79 +1,40 @@
 # Maintainer: Andy Botting <andy@andybotting.com>
 
-pkgname=('python-muranoclient' 'python2-muranoclient')
-pkgver='1.2.0'
-pkgrel='1'
+pkgname=python-muranoclient
+pkgver=1.2.0
+pkgrel=2
 pkgdesc='Python client library for Murano'
 arch=('any')
-url="https://docs.openstack.org/developer/${pkgname}/"
+url="https://docs.openstack.org/$pkgname/"
 license=('Apache')
-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=("https://github.com/openstack/${pkgname}/archive/${pkgver}.tar.gz")
+depends=('python-pbr' 'python-prettytable' 'python-glanceclient'
+         'python-keystoneclient' 'python-iso8601' 'python-six' 'python-babel'
+         'python-pyopenssl' 'python-requests' 'python-yaml' 'python-yaql'
+         'python-osc-lib' 'python-muranopkgcheck' 'python-oslo-serialization'
+         'python-oslo-utils' 'python-oslo-log' 'python-oslo-i18n')
+checkdepends=('python-fixtures' 'python-mock' 'python-requests-mock'
+              'python-tempest' 'python-stestr' 'python-testscenarios'
+              'python-testtools' 'python-oslotest' 'python-os-testr')
+source=("https://github.com/openstack/$pkgname/archive/$pkgver.tar.gz")
 sha512sums=('6c8281a694b637d73a48e4f2f81b515c97ffc7a0432a2653258690b31ceb72d1a1793462d61901c628bd2699c0fbbbd6beaf9b1257bd2f9a9114103dd06c5434')
 
-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
   # Fix test function name for Python 3
   sed -i 's/assertItemsEqual/assertCountEqual/g' muranoclient/tests/unit/osc/v1/*.py
   stestr run
-
-  cd "${srcdir}/${pkgname}-${pkgver}-py2"
-  PYTHON=python2 stestr2 run
-}
-
-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-log' 'python-oslo-i18n')
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  python setup.py install --root="${pkgdir}" --optimize=1
 }
 
-package_python2-muranoclient() {
-  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-${pkgver}-py2"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  mv "${pkgdir}"/usr/bin/murano{,2}
+package() {
+  cd $pkgname-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1
 }
 
 # vim:set ts=2 sw=2 et: