Update to v1.27.0-2 and drop Py2

2 files changed, 25 insertions, 107 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b19c40c870ac..59bf45762f2a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,51 +1,17 @@
 pkgbase = python-manilaclient
 	pkgdesc = Client library for OpenStack Manila API
 	pkgver = 1.27.0
-	pkgrel = 1
-	url = http://docs.openstack.org/developer/python-manilaclient
+	pkgrel = 2
+	url = http://docs.openstack.org/python-manilaclient
 	arch = any
 	license = Apache
-	checkdepends = python-pbr
-	checkdepends = python2-pbr
-	checkdepends = python-oslo-config
-	checkdepends = python2-oslo-config
-	checkdepends = python-oslo-log
-	checkdepends = python2-oslo-log
-	checkdepends = python-oslo-serialization
-	checkdepends = python2-oslo-serialization
-	checkdepends = python-oslo-utils
-	checkdepends = python2-oslo-utils
-	checkdepends = python-prettytable
-	checkdepends = python2-prettytable
-	checkdepends = python-requests
-	checkdepends = python2-requests
-	checkdepends = python-simplejson
-	checkdepends = python2-simplejson
-	checkdepends = python-babel
-	checkdepends = python2-babel
-	checkdepends = python-six
-	checkdepends = python2-six
-	checkdepends = python-keystoneclient
-	checkdepends = python2-keystoneclient
 	checkdepends = python-ddt
-	checkdepends = python2-ddt
 	checkdepends = python-fixtures
-	checkdepends = python2-fixtures
 	checkdepends = python-mock
-	checkdepends = python2-mock
-	checkdepends = python-oslotest
-	checkdepends = python2-oslotest
-	checkdepends = python-testtools
-	checkdepends = python2-testtools
-	checkdepends = python-stestr
-	checkdepends = python2-stestr
+	checkdepends = python-os-testr
 	checkdepends = python-tempest
-	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	source = https://github.com/openstack/python-manilaclient/archive/1.27.0.tar.gz
-	sha512sums = 161e7fd66c5761362d656eb37b0a5b19b5922b5ab92410cb67292a6bdeb39c3fca3cd8170ccefe56b93762c9eba39220610494139494897ab9805264f8090ea3
-
-pkgname = python-manilaclient
+	checkdepends = python-testtools
+	checkdepends = python-openstackclient
 	depends = python-oslo-config
 	depends = python-oslo-log
 	depends = python-oslo-serialization
@@ -57,17 +23,8 @@ pkgname = python-manilaclient
 	depends = python-babel
 	depends = python-six
 	depends = python-keystoneclient
+	source = https://github.com/openstack/python-manilaclient/archive/1.27.0.tar.gz
+	sha512sums = 161e7fd66c5761362d656eb37b0a5b19b5922b5ab92410cb67292a6bdeb39c3fca3cd8170ccefe56b93762c9eba39220610494139494897ab9805264f8090ea3
 
-pkgname = python2-manilaclient
-	depends = python2-oslo-config
-	depends = python2-oslo-log
-	depends = python2-oslo-serialization
-	depends = python2-oslo-utils
-	depends = python2-pbr
-	depends = python2-prettytable
-	depends = python2-requests
-	depends = python2-simplejson
-	depends = python2-babel
-	depends = python2-six
-	depends = python2-keystoneclient
+pkgname = python-manilaclient
 
diff --git a/PKGBUILD b/PKGBUILD
index b68eb30b8cd3..1510fb50579c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,75 +1,36 @@
 # Maintainer: Andy Botting <andy@andybotting.com>
 
-pkgname=('python-manilaclient' 'python2-manilaclient')
-pkgver='1.27.0'
-pkgrel='1'
+pkgname=python-manilaclient
+pkgver=1.27.0
+pkgrel=2
 pkgdesc='Client library for OpenStack Manila API'
 arch=('any')
-url="http://docs.openstack.org/developer/${pkgname}"
+url="http://docs.openstack.org/$pkgname"
 license=('Apache')
-makedepends=('python-setuptools' 'python2-setuptools')
-source=("https://github.com/openstack/${pkgname}/archive/${pkgver}.tar.gz")
-checkdepends=('python-pbr' 'python2-pbr'
-              'python-oslo-config' 'python2-oslo-config'
-              'python-oslo-log' 'python2-oslo-log'
-              'python-oslo-serialization' 'python2-oslo-serialization'
-              'python-oslo-utils' 'python2-oslo-utils'
-              'python-prettytable' 'python2-prettytable'
-              'python-requests' 'python2-requests'
-              'python-simplejson' 'python2-simplejson'
-              'python-babel' 'python2-babel'
-              'python-six' 'python2-six'
-              'python-keystoneclient' 'python2-keystoneclient'
-              'python-ddt' 'python2-ddt'
-              'python-fixtures' 'python2-fixtures'
-              'python-mock' 'python2-mock'
-              'python-oslotest'  'python2-oslotest'
-              'python-testtools' 'python2-testtools'
-              'python-stestr' 'python2-stestr'
-              'python-tempest')
+depends=('python-oslo-config' 'python-oslo-log' 'python-oslo-serialization'
+         'python-oslo-utils' 'python-pbr' 'python-prettytable'
+         'python-requests' 'python-simplejson' 'python-babel' 'python-six'
+         'python-keystoneclient')
+checkdepends=('python-ddt' 'python-fixtures' 'python-mock' 'python-os-testr'
+              'python-tempest' 'python-testtools' 'python-openstackclient')
+source=("https://github.com/openstack/$pkgname/archive/$pkgver.tar.gz")
 sha512sums=('161e7fd66c5761362d656eb37b0a5b19b5922b5ab92410cb67292a6bdeb39c3fca3cd8170ccefe56b93762c9eba39220610494139494897ab9805264f8090ea3')
 
-prepare() {
-  # Fix tests where ~ is not replaced with %7E
-  sed -i 's/%7E/~/' "${srcdir}/${pkgname}-${pkgver}"/manilaclient/tests/unit/v2/*.py
-  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
-
-  # No python2-tempest
-  #cd "${srcdir}/${pkgname}-py2"
-  #PYTHON=python2 stestr2 run
-}
-
-package_python-manilaclient() {
-  depends=('python-oslo-config' 'python-oslo-log' 'python-oslo-serialization'
-           'python-oslo-utils' 'python-pbr' 'python-prettytable'
-           'python-requests' 'python-simplejson' 'python-babel' 'python-six'
-           'python-keystoneclient')
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  python setup.py install --root="${pkgdir}" --optimize=1
 }
 
-package_python2-manilaclient() {
-  depends=('python2-oslo-config' 'python2-oslo-log'
-           'python2-oslo-serialization' 'python2-oslo-utils' 'python2-pbr'
-           'python2-prettytable' 'python2-requests' 'python2-simplejson'
-           'python2-babel' 'python2-six' 'python2-keystoneclient')
-  cd "${srcdir}/python-manilaclient-${pkgver}-py2"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  mv "${pkgdir}"/usr/bin/manila{,2}
+package() {
+  cd $pkgname-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1
 }
 
 # vim:set ts=2 sw=2 et: