Update to v7.0.4-2 and drop Py2

2 files changed, 18 insertions, 87 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 204684716e9d..f4d643882e5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,47 +1,15 @@
 pkgbase = python-gnocchiclient
 	pkgdesc = Python bindings to the Gnocchi API
 	pkgver = 7.0.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gnocchi.xyz/gnocchiclient/
 	arch = any
 	license = Apache
-	checkdepends = python-pbr
-	checkdepends = python2-pbr
-	checkdepends = python-cliff
-	checkdepends = python2-cliff
-	checkdepends = python-ujson
-	checkdepends = python2-ujson
-	checkdepends = python-keystoneauth1
-	checkdepends = python2-keystoneauth1
-	checkdepends = python-six
-	checkdepends = python2-six
-	checkdepends = python-futurist
-	checkdepends = python2-futurist
-	checkdepends = python-iso8601
-	checkdepends = python2-iso8601
-	checkdepends = python-monotonic
-	checkdepends = python2-monotonic
-	checkdepends = python-dateutil
-	checkdepends = python2-dateutil
-	checkdepends = python-debtcollector
-	checkdepends = python2-debtcollector
 	checkdepends = python-testtools
-	checkdepends = python2-testtools
 	checkdepends = python-fixtures
-	checkdepends = python2-fixtures
 	checkdepends = python-openstackclient
-	checkdepends = python2-openstackclient
 	checkdepends = python-pytest
-	checkdepends = python2-pytest
 	checkdepends = python-pytest-xdist
-	checkdepends = python2-pytest-xdist
-	makedepends = git
-	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	source = https://github.com/gnocchixyz/python-gnocchiclient/archive/7.0.4.tar.gz
-	sha512sums = 46cfe78ecba2f18424814452289de3e0ac40d0e8580f6e303616676aa5f145a8eea6df95aa24ca32cb26fba4adf954045c0c00d9a93f2c8b92bd4feb5ba5401b
-
-pkgname = python-gnocchiclient
 	depends = python-pbr
 	depends = python-cliff
 	depends = python-ujson
@@ -52,16 +20,8 @@ pkgname = python-gnocchiclient
 	depends = python-monotonic
 	depends = python-dateutil
 	depends = python-debtcollector
+	source = https://github.com/gnocchixyz/python-gnocchiclient/archive/7.0.4.tar.gz
+	sha512sums = 46cfe78ecba2f18424814452289de3e0ac40d0e8580f6e303616676aa5f145a8eea6df95aa24ca32cb26fba4adf954045c0c00d9a93f2c8b92bd4feb5ba5401b
 
-pkgname = python2-gnocchiclient
-	depends = python2-pbr
-	depends = python2-cliff
-	depends = python2-ujson
-	depends = python2-keystoneauth1
-	depends = python2-six
-	depends = python2-futurist
-	depends = python2-iso8601
-	depends = python2-monotonic
-	depends = python2-dateutil
-	depends = python2-debtcollector
+pkgname = python-gnocchiclient
 
diff --git a/PKGBUILD b/PKGBUILD
index 2f40fdc52151..40b3ff987c50 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,30 @@
 # Maintainer: Andy Botting <andy@andybotting.com>
 
-pkgname=('python-gnocchiclient' 'python2-gnocchiclient')
-pkgver='7.0.4'
-pkgrel='1'
+pkgname=python-gnocchiclient
+pkgver=7.0.4
+pkgrel=2
 pkgdesc='Python bindings to the Gnocchi API'
 arch=('any')
 url='https://gnocchi.xyz/gnocchiclient/'
 license=('Apache')
-makedepends=('git' 'python-setuptools' 'python2-setuptools')
-checkdepends=('python-pbr' 'python2-pbr'
-              'python-cliff' 'python2-cliff'
-              'python-ujson' 'python2-ujson'
-              'python-keystoneauth1' 'python2-keystoneauth1'
-              'python-six' 'python2-six'
-              'python-futurist' 'python2-futurist'
-              'python-iso8601' 'python2-iso8601'
-              'python-monotonic' 'python2-monotonic'
-              'python-dateutil' 'python2-dateutil'
-              'python-debtcollector' 'python2-debtcollector'
-              'python-testtools' 'python2-testtools'
-              'python-fixtures' 'python2-fixtures'
-              'python-openstackclient' 'python2-openstackclient'
-              'python-pytest' 'python2-pytest'
-              'python-pytest-xdist' 'python2-pytest-xdist')
-source=("https://github.com/gnocchixyz/${pkgname}/archive/${pkgver}.tar.gz")
+depends=('python-pbr' 'python-cliff' 'python-ujson' 'python-keystoneauth1'
+         'python-six' 'python-futurist' 'python-iso8601' 'python-monotonic'
+         'python-dateutil' 'python-debtcollector')
+checkdepends=('python-testtools' 'python-fixtures' 'python-openstackclient'
+              'python-pytest' 'python-pytest-xdist')
+source=("https://github.com/gnocchixyz/$pkgname/archive/$pkgver.tar.gz")
 sha512sums=('46cfe78ecba2f18424814452289de3e0ac40d0e8580f6e303616676aa5f145a8eea6df95aa24ca32cb26fba4adf954045c0c00d9a93f2c8b92bd4feb5ba5401b')
 
-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
-}
-
-package_python-gnocchiclient() {
-  depends=('python-pbr' 'python-cliff' 'python-ujson' 'python-keystoneauth1'
-           'python-six' 'python-futurist' 'python-iso8601' 'python-monotonic'
-           'python-dateutil' 'python-debtcollector')
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  python setup.py install --root="${pkgdir}" --optimize=1
 }
 
-package_python2-gnocchiclient() {
-  depends=('python2-pbr' 'python2-cliff' 'python2-ujson' 'python2-keystoneauth1'
-           'python2-six' 'python2-futurist' 'python2-iso8601' 'python2-monotonic'
-           'python2-dateutil' 'python2-debtcollector')
-  cd "${srcdir}/python-gnocchiclient-${pkgver}-py2"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  mv "${pkgdir}"/usr/bin/gnocchi{,2}
+package() {
+  cd $pkgname-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1
 }
 
 # vim:set ts=2 sw=2 et: