Update to v4.8.1-2

2 files changed, 25 insertions, 95 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49172394ff4b..907a38a6e672 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,66 +1,30 @@
 pkgbase = python-barbicanclient
 	pkgdesc = Client library for the Barbican Key Management API
 	pkgver = 4.8.1
-	pkgrel = 1
-	url = http://docs.openstack.org/developer/python-barbicanclient
+	pkgrel = 2
+	url = https://docs.openstack.org/python-barbicanclient/
 	arch = any
 	license = Apache
 	checkdepends = python-fixtures
-	checkdepends = python2-fixtures
 	checkdepends = python-requests-mock
-	checkdepends = python2-requests-mock
 	checkdepends = python-mock
-	checkdepends = python2-mock
 	checkdepends = python-testrepository
-	checkdepends = python2-testrepository
 	checkdepends = python-testtools
-	checkdepends = python2-testtools
 	checkdepends = python-oslotest
-	checkdepends = python2-oslotest
 	checkdepends = python-nose
-	checkdepends = python2-nose
 	checkdepends = python-oslo-config
-	checkdepends = python2-oslo-config
 	checkdepends = python-openstackclient
-	checkdepends = python2-openstackclient
-	makedepends = python-pbr
-	makedepends = python2-pbr
-	makedepends = python-prettytable
-	makedepends = python2-prettytable
-	makedepends = python-requests
-	makedepends = python2-requests
-	makedepends = python-six
-	makedepends = python2-six
-	makedepends = python-cliff
-	makedepends = python2-cliff
-	makedepends = python-keystoneauth1
-	makedepends = python2-keystoneauth1
-	makedepends = python-oslo-i18n
-	makedepends = python2-oslo-i18n
-	makedepends = python-oslo-serialization
-	makedepends = python2-oslo-serialization
-	makedepends = python-oslo-utils
-	makedepends = python2-oslo-utils
-	source = https://github.com/openstack/python-barbicanclient/archive/4.8.1.tar.gz
-	sha512sums = 4a99a32d8950957ab2548353a3b4275b95bc830f1b479c1d5592e884af4263ed937080e8ec9ce21dddfe3c42f2370d3278babd9332a318ac43c1c387404ca592
-
-pkgname = python-barbicanclient
 	depends = python-pbr
-	depends = python-six
+	depends = python-prettytable
 	depends = python-requests
+	depends = python-six
 	depends = python-cliff
 	depends = python-keystoneauth1
 	depends = python-oslo-i18n
 	depends = python-oslo-serialization
 	depends = python-oslo-utils
+	source = https://github.com/openstack/python-barbicanclient/archive/4.8.1.tar.gz
+	sha512sums = 4a99a32d8950957ab2548353a3b4275b95bc830f1b479c1d5592e884af4263ed937080e8ec9ce21dddfe3c42f2370d3278babd9332a318ac43c1c387404ca592
 
-pkgname = python2-barbicanclient
-	depends = python2-pbr
-	depends = python2-six
-	depends = python2-requests
-	depends = python2-cliff
-	depends = python2-keystoneauth1
-	depends = python2-oslo-i18n
-	depends = python2-oslo-serialization
-	depends = python2-oslo-utils
+pkgname = python-barbicanclient
 
diff --git a/PKGBUILD b/PKGBUILD
index fd1379877b14..86e32b7cc54a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,71 +1,37 @@
 # Maintainer: Andy Botting <andy@andybotting.com>
 
-pkgname=('python-barbicanclient' 'python2-barbicanclient')
-pkgver='4.8.1'
-pkgrel='1'
+pkgname=python-barbicanclient
+pkgver=4.8.1
+pkgrel=2
 pkgdesc='Client library for the Barbican Key Management API'
 arch=('any')
-url="http://docs.openstack.org/developer/${pkgname}"
+url="https://docs.openstack.org/$pkgname/"
 license=('Apache')
-makedepends=('python-pbr' 'python2-pbr'
-             'python-prettytable' 'python2-prettytable'
-             'python-requests' 'python2-requests'
-             'python-six' 'python2-six'
-             'python-cliff' 'python2-cliff'
-             'python-keystoneauth1' 'python2-keystoneauth1'
-             'python-oslo-i18n' 'python2-oslo-i18n'
-             'python-oslo-serialization' 'python2-oslo-serialization'
-             'python-oslo-utils' 'python2-oslo-utils')
-checkdepends=('python-fixtures' 'python2-fixtures'
-              'python-requests-mock' 'python2-requests-mock'
-              'python-mock' 'python2-mock'
-              'python-testrepository' 'python2-testrepository'
-              'python-testtools' 'python2-testtools'
-              'python-oslotest' 'python2-oslotest'
-              'python-nose' 'python2-nose'
-              'python-oslo-config' 'python2-oslo-config'
-              'python-openstackclient' 'python2-openstackclient')
-source=("https://github.com/openstack/${pkgname}/archive/${pkgver}.tar.gz")
+depends=('python-pbr' 'python-prettytable' 'python-requests' 'python-six'
+         'python-cliff' 'python-keystoneauth1' 'python-oslo-i18n'
+         'python-oslo-serialization' 'python-oslo-utils')
+checkdepends=('python-fixtures' 'python-requests-mock' 'python-mock'
+              'python-testrepository' 'python-testtools' 'python-oslotest'
+              'python-nose' 'python-oslo-config' 'python-openstackclient')
+source=("https://github.com/openstack/$pkgname/archive/$pkgver.tar.gz")
 sha512sums=('4a99a32d8950957ab2548353a3b4275b95bc830f1b479c1d5592e884af4263ed937080e8ec9ce21dddfe3c42f2370d3278babd9332a318ac43c1c387404ca592')
 
-prepare() {
-  cp -a "${srcdir}/${pkgname}-${pkgver}"{,-py2}
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's/assertItemsEqual/assertCountEqual/g' barbicanclient/tests/v1/*.py
-  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
+  sed -i 's/assertItemsEqual/assertCountEqual/g' barbicanclient/tests/v1/*.py
   stestr run
-
-  cd "${srcdir}/${pkgname}-${pkgver}-py2"
-  PYTHON=python2 stestr2 run
-}
-
-package_python-barbicanclient() {
-  depends=('python-pbr' 'python-six' 'python-requests' 'python-cliff'
-           'python-keystoneauth1' 'python-oslo-i18n'
-           'python-oslo-serialization' 'python-oslo-utils')
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  python setup.py install --root="${pkgdir}" --optimize=1
 }
 
-package_python2-barbicanclient() {
-  depends=('python2-pbr' 'python2-six' 'python2-requests' 'python2-cliff'
-           'python2-keystoneauth1' 'python2-oslo-i18n'
-           'python2-oslo-serialization' 'python2-oslo-utils')
-  cd "${srcdir}/python-barbicanclient-${pkgver}-py2"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  mv "${pkgdir}"/usr/bin/barbican{,2}
+package() {
+  cd $pkgname-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1
 }
 
 # vim:set ts=2 sw=2 et: