Update to v2.11.3 and drop Py2

2 files changed, 21 insertions, 91 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 54464bf485ba..4bc67932b785 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,45 +1,14 @@
 pkgbase = python-designateclient
 	pkgdesc = Python client library for Designate
 	pkgver = 2.11.0
-	pkgrel = 2
-	url = https://docs.openstack.org/developer/python-designateclient
+	pkgrel = 3
+	url = https://docs.openstack.org/python-designateclient/
 	arch = any
 	license = Apache
-	checkdepends = python-cliff
-	checkdepends = python2-cliff
-	checkdepends = python-debtcollector
-	checkdepends = python2-debtcollector
-	checkdepends = python-jsonschema
-	checkdepends = python2-jsonschema
-	checkdepends = python-osc-lib
-	checkdepends = python2-osc-lib
-	checkdepends = python-oslo-utils
-	checkdepends = python2-oslo-utils
-	checkdepends = python-keystoneauth1
-	checkdepends = python2-keystoneauth1
-	checkdepends = python-pbr
-	checkdepends = python2-pbr
-	checkdepends = python-requests
-	checkdepends = python2-requests
-	checkdepends = python-six
-	checkdepends = python2-six
-	checkdepends = python-stevedore
-	checkdepends = python2-stevedore
 	checkdepends = python-oslo-config
-	checkdepends = python2-oslo-config
 	checkdepends = python-oslotest
-	checkdepends = python2-oslotest
 	checkdepends = python-requests-mock
-	checkdepends = python2-requests-mock
 	checkdepends = python-subunit
-	checkdepends = python2-subunit
-	makedepends = git
-	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	source = https://github.com/openstack/python-designateclient/archive/2.11.0.tar.gz
-	sha512sums = 8ddb35695fd4997819ee6c1afbf1099d54591563871a2f9f831c34e357b4607cd3045404616f39b8710a73e2436ffac932a7e04f669054f55d266c7381770a13
-
-pkgname = python-designateclient
 	depends = python-cliff
 	depends = python-debtcollector
 	depends = python-jsonschema
@@ -50,16 +19,8 @@ pkgname = python-designateclient
 	depends = python-requests
 	depends = python-six
 	depends = python-stevedore
+	source = https://github.com/openstack/python-designateclient/archive/2.11.0.tar.gz
+	sha512sums = 8ddb35695fd4997819ee6c1afbf1099d54591563871a2f9f831c34e357b4607cd3045404616f39b8710a73e2436ffac932a7e04f669054f55d266c7381770a13
 
-pkgname = python2-designateclient
-	depends = python2-cliff
-	depends = python2-debtcollector
-	depends = python2-jsonschema
-	depends = python2-osc-lib
-	depends = python2-oslo-utils
-	depends = python2-keystoneauth1
-	depends = python2-pbr
-	depends = python2-requests
-	depends = python2-six
-	depends = python2-stevedore
+pkgname = python-designateclient
 
diff --git a/PKGBUILD b/PKGBUILD
index 0bffdf01dfc9..e6af19177bb0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,66 +1,35 @@
 # Maintainer: Andy Botting <andy@andybotting.com>
 
-pkgname=('python-designateclient' 'python2-designateclient')
-pkgver='2.11.0'
-pkgrel='2'
+pkgname=python-designateclient
+pkgver=2.11.0
+pkgrel=3
 pkgdesc='Python client library for Designate'
 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-cliff' 'python2-cliff'
-              'python-debtcollector' 'python2-debtcollector'
-              'python-jsonschema' 'python2-jsonschema'
-              'python-osc-lib' 'python2-osc-lib'
-              'python-oslo-utils' 'python2-oslo-utils'
-              'python-keystoneauth1' 'python2-keystoneauth1'
-              'python-pbr' 'python2-pbr'
-              'python-requests' 'python2-requests'
-              'python-six' 'python2-six'
-              'python-stevedore' 'python2-stevedore'
-              'python-oslo-config' 'python2-oslo-config'
-              'python-oslotest' 'python2-oslotest'
-              'python-requests-mock' 'python2-requests-mock'
-              'python-subunit' 'python2-subunit')
-source=("https://github.com/openstack/${pkgname}/archive/${pkgver}.tar.gz")
+depends=('python-cliff' 'python-debtcollector' 'python-jsonschema'
+         'python-osc-lib' 'python-oslo-utils' 'python-keystoneauth1'
+         'python-pbr' 'python-requests' 'python-six' 'python-stevedore')
+checkdepends=('python-oslo-config' 'python-oslotest' 'python-requests-mock'
+              'python-subunit')
+source=("https://github.com/openstack/$pkgname/archive/$pkgver.tar.gz")
 sha512sums=('8ddb35695fd4997819ee6c1afbf1099d54591563871a2f9f831c34e357b4607cd3045404616f39b8710a73e2436ffac932a7e04f669054f55d266c7381770a13')
 
-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
   stestr run
-
-  cd "${srcdir}/${pkgname}-${pkgver}-py2"
-  PYTHON=python2 stestr run
-}
-
-package_python-designateclient() {
-  depends=('python-cliff' 'python-debtcollector' 'python-jsonschema'
-           'python-osc-lib' 'python-oslo-utils' 'python-keystoneauth1'
-           'python-pbr' 'python-requests' 'python-six' 'python-stevedore')
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  python setup.py install --root="${pkgdir}" --optimize=1
 }
 
-package_python2-designateclient() {
-  depends=('python2-cliff' 'python2-debtcollector' 'python2-jsonschema'
-           'python2-osc-lib' 'python2-oslo-utils' 'python2-keystoneauth1'
-           'python2-pbr' 'python2-requests' 'python2-six' 'python2-stevedore')
-  cd "${srcdir}/python-designateclient-${pkgver}-py2"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  mv "${pkgdir}"/usr/bin/designate{,2}
+package() {
+  cd $pkgname-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1
 }
 
 # vim:set ts=2 sw=2 et: