[arch-commits] Commit in python-oslo-log/trunk (PKGBUILD)

[Felix Yan]

    Date: Thursday, February 13, 2020 @ 10:37:43
  Author: felixonmars
Revision: 570038

upgpkg: python-oslo-log 4.0.0-2: disable tests for python2

Modified:
  python-oslo-log/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-13 10:36:37 UTC (rev 570037)
+++ PKGBUILD	2020-02-13 10:37:43 UTC (rev 570038)
@@ -4,7 +4,7 @@
 pkgbase=python-oslo-log
 pkgname=(python-oslo-log python2-oslo-log)
 pkgver=4.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Oslo Logging Library"
 arch=('any')
 url="https://pypi.python.org/pypi/oslo.log/$pkgver"
@@ -15,16 +15,16 @@
              'python2-oslo-serialization' 'python-debtcollector' 'python2-debtcollector'
              'python-pyinotify' 'python2-pyinotify' 'python-dateutil' 'python2-dateutil'
              'python-monotonic' 'python2-monotonic')
-checkdepends=('python-mock' 'python2-mock' 'python-oslotest' 'python2-oslotest')
+checkdepends=('python-mock' 'python-oslotest')
 options=('!emptydirs')
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/openstack/oslo.log/archive/$pkgver.tar.gz")
 sha512sums=('aaa937632aedeb00262880a9729a15e07c533becf02f5666408d4b238f813dbd2f1c323aa04e026622b71e06555d6a5472b0f87d572026baa9774d77820a2fab')
 
+export PBR_VERSION=$pkgver
+
 prepare() {
   sed -i 's/unittest2/unittest/g' oslo.log-$pkgver/oslo_log/tests/unit/*.py
   cp -a oslo.log-$pkgver{,-py2}
-
-  export PBR_VERSION=$pkgver
 }
 
 build() {
@@ -36,11 +36,8 @@
 }
 
 check() {
-  cd "$srcdir"/oslo.log-$pkgver
-  stestr run || warning "Tests failed"
-
-  cd "$srcdir"/oslo.log-$pkgver-py2
-  PYTHON=python2 stestr2 run
+  cd oslo.log-$pkgver
+  stestr run
 }
 
 package_python-oslo-log() {