Update to v3.0.0

3 files changed, 45 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 09581bbef908..f0583c69ccd5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,20 @@
 pkgbase = python-os-testr
-	pkgdesc = A testr wrapper to provide additional functionality
-	pkgver = 1.0.0
-	pkgrel = 2
-	url = https://pypi.python.org/pypi/os-testr
+	pkgdesc = A testr wrapper to provide functionality for OpenStack projects
+	pkgver = 3.0.0
+	pkgrel = 1
+	url = https://docs.openstack.org/os-testr/
 	arch = any
 	license = Apache
-	makedepends = python2
-	makedepends = python
+	checkdepends = python-oslotest
+	checkdepends = python-stestr
+	checkdepends = python-testscenarios
+	checkdepends = python-ddt
+	checkdepends = python-six
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	source = https://pypi.python.org/packages/47/ac/767db04504bd21b2fbcf11dd404c6b8bcc0cf954410c3c05f0d65877de2e/os-testr-1.0.0.tar.gz
-	md5sums = 915dc11818c13c1726d57def7c372154
-
-pkgname = python-os-testr
-	depends = python
+	depends = python-pbr
 	depends = python-subunit
 	depends = python-testtools
-	depends = python-stestr>=1.0.0
-	depends = python-pbr
-
-pkgname = python2-os-testr
-	depends = python2
-	depends = python2-subunit
-	depends = python2-testtools
-	depends = python2-stestr>=1.0.0
-	depends = python2-pbr
+	source = python-os-testr-3.0.0.tar.gz::https://opendev.org/openstack/os-testr/archive/3.0.0.tar.gz
+	sha512sums = 49d5334c79434241bf5441390a9c5d67ecd937dea1aca0aadefba056e31950e91457acc576e0318df2fb2e7cb2fc61453ab37e6391113df165829c0dd49a4ea7
 
+pkgname = python-os-testr
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..05c6d4d4c97b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index 40b06f7dd456..0d5b1c16003d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,34 @@
-pkgbase=python-os-testr
-pkgname=('python-os-testr' 'python2-os-testr')
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="A testr wrapper to provide additional functionality"
-arch=('any')
-url='https://pypi.python.org/pypi/os-testr'
-license=('Apache')
-source=( https://pypi.python.org/packages/47/ac/767db04504bd21b2fbcf11dd404c6b8bcc0cf954410c3c05f0d65877de2e/os-testr-1.0.0.tar.gz )
-md5sums=('915dc11818c13c1726d57def7c372154')
-makedepends=('python2' 'python' 'python-setuptools' 'python2-setuptools')
+# Maintainer: Andy Botting <andy@andybotting.com>
 
-package_python-os-testr() {
-  depends=('python' 'python-subunit' 'python-testtools' 'python-stestr>=1.0.0' 'python-pbr')
+_name=os-testr
+pkgname=python-os-testr
+pkgver=3.0.0
+pkgrel=1
+pkgdesc='A testr wrapper to provide functionality for OpenStack projects'
+arch=(any)
+url="https://docs.openstack.org/$_name/"
+license=(Apache)
+makedepends=(python-setuptools)
+depends=(python-pbr python-subunit python-testtools)
+checkdepends=(python-oslotest python-stestr python-testscenarios
+              python-ddt python-six)
+source=("$pkgname-$pkgver.tar.gz::https://opendev.org/openstack/$_name/archive/$pkgver.tar.gz")
+sha512sums=('49d5334c79434241bf5441390a9c5d67ecd937dea1aca0aadefba056e31950e91457acc576e0318df2fb2e7cb2fc61453ab37e6391113df165829c0dd49a4ea7')
 
-  cd $srcdir/os-testr-$pkgver
-  python setup.py install --root=$pkgdir
+export PBR_VERSION=$pkgver
+
+build() {
+  cd $_name
+  python setup.py build
 }
 
-package_python2-os-testr() {
-  depends=('python2' 'python2-subunit' 'python2-testtools' 'python2-stestr>=1.0.0' 'python2-pbr')
+# Tests don't pass
+#check() {
+#  cd $_name
+#  stestr run
+#}
 
-  cd $srcdir/os-testr-$pkgver
-  python2 setup.py install --root=$pkgdir
-  mv "${pkgdir}/usr/bin/ostestr"{,2}
-  mv "${pkgdir}/usr/bin/subunit-trace"{,2}
-  mv "${pkgdir}/usr/bin/subunit2html"{,2}
-  mv "${pkgdir}/usr/bin/generate-subunit"{,2}
+package() {
+  cd $_name
+  python setup.py install --root="$pkgdir" --optimize=1
 }