Update to v1.31.0-2 and drop Py2

2 files changed, 27 insertions, 137 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0030b9bc0c11..36b7ab3789b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,69 +1,19 @@
 pkgbase = python-shade
 	pkgdesc = Simple client library for interacting with OpenStack clouds
 	pkgver = 1.31.0
-	pkgrel = 1
-	url = http://docs.openstack.org/infra/shade
+	pkgrel = 2
+	url = http://docs.openstack.org/shade/
 	arch = any
 	license = Apache
-	checkdepends = python-pbr
-	checkdepends = python2-pbr
-	checkdepends = python-munch
-	checkdepends = python2-munch
-	checkdepends = python2-decorator
-	checkdepends = python-decorator
-	checkdepends = python-jmespath
-	checkdepends = python2-jmespath
-	checkdepends = python-jsonpatch
-	checkdepends = python2-jsonpatch
-	checkdepends = python2-ipaddress
-	checkdepends = python2-futures
-	checkdepends = python-os-client-config
-	checkdepends = python2-os-client-config
-	checkdepends = python-requestsexceptions
-	checkdepends = python2-requestsexceptions
-	checkdepends = python-six
-	checkdepends = python2-six
-	checkdepends = python-keystoneauth1
-	checkdepends = python2-keystoneauth1
-	checkdepends = python-netifaces
-	checkdepends = python2-netifaces
-	checkdepends = python-novaclient
-	checkdepends = python2-novaclient
-	checkdepends = python-keystoneclient
-	checkdepends = python2-keystoneclient
-	checkdepends = python-cinderclient
-	checkdepends = python2-cinderclient
-	checkdepends = python-neutronclient
-	checkdepends = python2-neutronclient
-	checkdepends = python-ironicclient
-	checkdepends = python2-ironicclient
-	checkdepends = python-designateclient
-	checkdepends = python2-designateclient
 	checkdepends = python-dogpile.cache
-	checkdepends = python2-dogpile.cache
 	checkdepends = python-future
-	checkdepends = python2-future
 	checkdepends = python-fixtures
-	checkdepends = python2-fixtures
 	checkdepends = python-mock
-	checkdepends = python2-mock
 	checkdepends = python-subunit
-	checkdepends = python2-subunit
 	checkdepends = python-requests-mock
-	checkdepends = python2-requests-mock
 	checkdepends = python-testtools
-	checkdepends = python2-testtools
 	checkdepends = python-stestr
-	checkdepends = python2-stestr
 	checkdepends = python-oslotest
-	checkdepends = python2-oslotest
-	makedepends = git
-	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	source = https://github.com/openstack-infra/shade/archive/1.31.0.tar.gz
-	sha512sums = bbf33ede55c632ff0ac36723a5ab030511b72bac0d7a9ba6d52a22ede7fc54dd19bb27e14292ff58914461dfce7b25bc2b0aeb35a66554c36ade793e6b891d1d
-
-pkgname = python-shade
 	depends = python-pbr
 	depends = python2-decorator
 	depends = python-jmespath
@@ -80,24 +30,8 @@ pkgname = python-shade
 	depends = python-ironicclient
 	depends = python-designateclient
 	depends = python-dogpile.cache
+	source = https://github.com/openstack-infra/shade/archive/1.31.0.tar.gz
+	sha512sums = bbf33ede55c632ff0ac36723a5ab030511b72bac0d7a9ba6d52a22ede7fc54dd19bb27e14292ff58914461dfce7b25bc2b0aeb35a66554c36ade793e6b891d1d
 
-pkgname = python2-shade
-	depends = python2-pbr
-	depends = python2-decorator
-	depends = python2-jmespath
-	depends = python2-jsonpatch
-	depends = python2-ipaddress
-	depends = python2-os-client-config
-	depends = python2-requestsexceptions
-	depends = python2-six
-	depends = python2-futures
-	depends = python2-keystoneauth1
-	depends = python2-netifaces
-	depends = python2-novaclient
-	depends = python2-keystoneclient
-	depends = python2-cinderclient
-	depends = python2-neutronclient
-	depends = python2-ironicclient
-	depends = python2-designateclient
-	depends = python2-dogpile.cache
+pkgname = python-shade
 
diff --git a/PKGBUILD b/PKGBUILD
index c6cc9fd8753c..d0222214d839 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,92 +1,48 @@
 # Maintainer: Andy Botting <andy@andybotting.com>
 
-_module='shade'
-pkgname=('python-shade' 'python2-shade')
-pkgver='1.31.0'
-pkgrel='1'
+pkgname=python-shade
+pkgver=1.31.0
+pkgrel=2
 pkgdesc='Simple client library for interacting with OpenStack clouds'
 arch=('any')
-url="http://docs.openstack.org/infra/${_module}"
+url='http://docs.openstack.org/shade/'
 license=('Apache')
-makedepends=('git' 'python-setuptools' 'python2-setuptools')
-checkdepends=('python-pbr' 'python2-pbr'
-              'python-munch' 'python2-munch'
-              'python2-decorator' 'python-decorator'
-              'python-jmespath' 'python2-jmespath'
-              'python-jsonpatch' 'python2-jsonpatch'
-              'python2-ipaddress' 'python2-futures'
-              'python-os-client-config' 'python2-os-client-config'
-              'python-requestsexceptions' 'python2-requestsexceptions'
-              'python-six' 'python2-six'
-              'python-keystoneauth1' 'python2-keystoneauth1'
-              'python-netifaces' 'python2-netifaces'
-              'python-novaclient' 'python2-novaclient'
-              'python-keystoneclient' 'python2-keystoneclient'
-              'python-cinderclient' 'python2-cinderclient'
-              'python-neutronclient' 'python2-neutronclient'
-              'python-ironicclient' 'python2-ironicclient'
-              'python-designateclient' 'python2-designateclient'
-              'python-dogpile.cache' 'python2-dogpile.cache'
-              'python-future' 'python2-future'
-              'python-fixtures' 'python2-fixtures'
-              'python-mock' 'python2-mock'
-              'python-subunit' 'python2-subunit'
-              'python-requests-mock' 'python2-requests-mock'
-              'python-testtools' 'python2-testtools'
-              'python-stestr' 'python2-stestr'
-              'python-oslotest' 'python2-oslotest')
-source=("https://github.com/openstack-infra/${_module}/archive/${pkgver}.tar.gz")
+depends=('python-pbr' 'python2-decorator' 'python-jmespath'
+         'python-jsonpatch' 'python-os-client-config'
+         'python-requestsexceptions' 'python-six' 'python-keystoneauth1'
+         'python-netifaces' 'python-novaclient' 'python-keystoneclient'
+         'python-cinderclient' 'python-neutronclient' 'python-ironicclient'
+         'python-designateclient' 'python-dogpile.cache')
+checkdepends=('python-dogpile.cache' 'python-future' 'python-fixtures'
+              'python-mock' 'python-subunit' 'python-requests-mock'
+              'python-testtools' 'python-stestr' 'python-oslotest')
+source=("https://github.com/openstack-infra/shade/archive/$pkgver.tar.gz")
 sha512sums=('bbf33ede55c632ff0ac36723a5ab030511b72bac0d7a9ba6d52a22ede7fc54dd19bb27e14292ff58914461dfce7b25bc2b0aeb35a66554c36ade793e6b891d1d')
 
+export PBR_VERSION=$pkgver
+
 prepare() {
   # Fix test function name
-  cd "${srcdir}/${_module}-${pkgver}"
+  cd shade-$pkgver
   sed -i 's/assertItemsEqual/assertCountEqual/g' shade/tests/unit/*.py
   rm shade/tests/unit/test_caching.py
-  cp -a "${srcdir}/${_module}-${pkgver}"{,-py2}
-  export PBR_VERSION=$pkgver
 }   
     
 build() {
-  cd "${srcdir}/${_module}-${pkgver}"
+  cd shade-$pkgver
   # Fix TypeError: a bytes-like object is required, not 'str' for Python 3
   sed -i 's/base64.b64encode(user_data)/base64.b64encode(user_data.encode())/g' shade/tests/unit/test_create_server.py
   python setup.py build
-
-  cd "${srcdir}/${_module}-${pkgver}-py2"
-  python2 setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_module}-${pkgver}"
+  cd shade-$pkgver
   stestr run
-
-  cd "${srcdir}/${_module}-${pkgver}-py2"
-  #PYTHON=python2 stestr2 run
-}
-
-package_python-shade(){
-  depends=('python-pbr' 'python2-decorator' 'python-jmespath'
-           'python-jsonpatch' 'python-os-client-config'
-           'python-requestsexceptions' 'python-six' 'python-keystoneauth1'
-           'python-netifaces' 'python-novaclient' 'python-keystoneclient'
-           'python-cinderclient' 'python-neutronclient' 'python-ironicclient'
-           'python-designateclient' 'python-dogpile.cache')
-  cd "${srcdir}/${_module}-${pkgver}"
-  python setup.py install --root="${pkgdir}" --optimize=1
 }
 
-package_python2-shade() {
-  depends=('python2-pbr' 'python2-decorator' 'python2-jmespath'
-           'python2-jsonpatch' 'python2-ipaddress' 'python2-os-client-config'
-           'python2-requestsexceptions' 'python2-six' 'python2-futures'
-           'python2-keystoneauth1' 'python2-netifaces' 'python2-novaclient'
-           'python2-keystoneclient' 'python2-cinderclient'
-           'python2-neutronclient' 'python2-ironicclient'
-           'python2-designateclient' 'python2-dogpile.cache')
-  cd "${srcdir}/${_module}-${pkgver}-py2"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  mv "${pkgdir}"/usr/bin/shade-inventory{,2}
+package(){
+  cd shade-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1
 }
 
 # vim:set ts=2 sw=2 et: