Update to v1.8.1-2 and frop Py2

2 files changed, 21 insertions, 76 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31cfca12c65a..b628bbe18862 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,47 +1,21 @@
 pkgbase = python-futurist
-	pkgdesc = Oslo Log library
+	pkgdesc = Code from the future, delivered to you in the now.
 	pkgver = 1.8.1
-	pkgrel = 1
-	url = https://docs.openstack.org/developer/futurist/
+	pkgrel = 2
+	url = https://docs.openstack.org/futurist/
 	arch = any
 	license = Apache
 	checkdepends = python-eventlet
-	checkdepends = python2-eventlet
 	checkdepends = python-oslotest
-	checkdepends = python2-oslotest
 	checkdepends = python-testrepository
-	checkdepends = python2-testrepository
 	checkdepends = python-testscenarios
-	checkdepends = python2-testscenarios
 	checkdepends = python-testtools
-	checkdepends = python2-testtools
-	makedepends = git
-	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	makedepends = python-pbr
-	makedepends = python2-pbr
-	makedepends = python-six
-	makedepends = python2-six
-	makedepends = python-monotonic
-	makedepends = python2-monotonic
-	makedepends = python2-futures
-	makedepends = python2-contextlib2
-	makedepends = python-prettytable
-	makedepends = python2-prettytable
-	source = https://github.com/openstack/futurist/archive/1.8.1.tar.gz
-	sha512sums = 2718593c54d2babba96a9a410f09648d7b32c038af912e3f217143ec0e2f11af6427c739acbf34b114351cb35aee869cf8ebcb7436c148f30ccc264664044cbe
-
-pkgname = python-futurist
 	depends = python-pbr
 	depends = python-six
 	depends = python-monotonic
 	depends = python-prettytable
+	source = https://github.com/openstack/futurist/archive/1.8.1.tar.gz
+	sha512sums = 2718593c54d2babba96a9a410f09648d7b32c038af912e3f217143ec0e2f11af6427c739acbf34b114351cb35aee869cf8ebcb7436c148f30ccc264664044cbe
 
-pkgname = python2-futurist
-	depends = python2-pbr
-	depends = python2-six
-	depends = python2-monotonic
-	depends = python2-futures
-	depends = python2-contextlib2
-	depends = python2-prettytable
+pkgname = python-futurist
 
diff --git a/PKGBUILD b/PKGBUILD
index adf1891edefc..6d7596fa6110 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,62 +1,33 @@
 # Maintainer: Andy Botting <andy@andybotting.com>
 
-_module='futurist'
-pkgname=('python-futurist' 'python2-futurist')
-pkgver='1.8.1'
-pkgrel='1'
-pkgdesc='Oslo Log library'
+pkgname=python-futurist
+pkgver=1.8.1
+pkgrel=2
+pkgdesc='Code from the future, delivered to you in the now.'
 arch=('any')
-url="https://docs.openstack.org/developer/${_module}/"
+url='https://docs.openstack.org/futurist/'
 license=('Apache')
-makedepends=('git' 'python-setuptools' 'python2-setuptools'
-             'python-pbr' 'python2-pbr'
-             'python-six' 'python2-six'
-             'python-monotonic' 'python2-monotonic'
-             'python2-futures'
-             'python2-contextlib2'
-             'python-prettytable' 'python2-prettytable')
-checkdepends=('python-eventlet' 'python2-eventlet'
-              'python-oslotest' 'python2-oslotest'
-              'python-testrepository' 'python2-testrepository'
-              'python-testscenarios' 'python2-testscenarios'
-              'python-testtools' 'python2-testtools')
-source=("https://github.com/openstack/${_module}/archive/${pkgver}.tar.gz")
+depends=('python-pbr' 'python-six' 'python-monotonic' 'python-prettytable')
+checkdepends=('python-eventlet' 'python-oslotest' 'python-testrepository'
+              'python-testscenarios' 'python-testtools')
+source=("https://github.com/openstack/futurist/archive/$pkgver.tar.gz")
 sha512sums=('2718593c54d2babba96a9a410f09648d7b32c038af912e3f217143ec0e2f11af6427c739acbf34b114351cb35aee869cf8ebcb7436c148f30ccc264664044cbe')
 
-prepare() {
-  cp -a "${srcdir}/${_module}-${pkgver}"{,-py2}
-  export PBR_VERSION=$pkgver
-}
+export PBR_VERSION=$pkgver
 
 build() {
-  cd "${srcdir}/${_module}-${pkgver}"
+  cd futurist-$pkgver
   python setup.py build
-
-  cd "${srcdir}/${_module}-${pkgver}-py2"
-  python2 setup.py build
 }
 
-# Tests disabled due to eventlet issues
 check() {
-  cd "${srcdir}/${_module}-${pkgver}"
+  cd futurist-$pkgver
   python setup.py test
-
-  cd "${srcdir}/${_module}-${pkgver}-py2"
-  PYTHON=python2 python2 setup.py test
-}
-
-package_python-futurist() {
-  depends=('python-pbr' 'python-six' 'python-monotonic'
-           'python-prettytable')
-  cd "${srcdir}/${_module}-${pkgver}"
-  python setup.py install --root="${pkgdir}/" --optimize=1
 }
 
-package_python2-futurist() {
-  depends=('python2-pbr' 'python2-six' 'python2-monotonic' 'python2-futures'
-           'python2-contextlib2' 'python2-prettytable')
-  cd "${srcdir}/${_module}-${pkgver}-py2"
-  python2 setup.py install --root="${pkgdir}/" --optimize=1
+package() {
+  cd futurist-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1
 }
 
 # vim:set ts=2 sw=2 et: