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

Felix Yan felixonmars at archlinux.org
Thu Feb 13 10:14:16 UTC 2020


    Date: Thursday, February 13, 2020 @ 10:14:16
  Author: felixonmars
Revision: 569998

upgpkg: python-oslo-config 6.12.0-2: disable tests for python2

Modified:
  python-oslo-config/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-13 10:08:55 UTC (rev 569997)
+++ PKGBUILD	2020-02-13 10:14:16 UTC (rev 569998)
@@ -4,7 +4,7 @@
 pkgbase=python-oslo-config
 pkgname=(python-oslo-config python2-oslo-config)
 pkgver=6.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="parsing command line arguments and .ini style configuration files"
 arch=('any')
 url="https://pypi.python.org/pypi/oslo.config/$pkgver"
@@ -13,35 +13,26 @@
              'python-stevedore' 'python2-stevedore' 'python-debtcollector' 'python2-debtcollector'
              'python-oslo-i18n' 'python2-oslo-i18n' 'python-rfc3986' 'python2-rfc3986'
              'python-yaml' 'python2-yaml' 'python2-enum34')
-checkdepends=('python-oslotest' 'python2-oslotest' 'python-sphinx' 'python2-sphinx'
-              'python-requests-mock' 'python2-requests-mock' 'python-oslo-log' 'python2-oslo-log')
+checkdepends=('python-oslotest' 'python-sphinx' 'python-requests-mock' 'python-oslo-log')
 options=('!emptydirs')
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/openstack/oslo.config/archive/$pkgver.tar.gz")
 sha512sums=('8a7fd522c6535a2b5e0863a1c839dda28cecd246b1c245181b523d5ca2eff32f5e27bb3fbaac60aa415fe3572310c6357bc6bff37cd842b88ce78e563c9f5e76')
 
+export PBR_VERSION=$pkgver
+
 prepare() {
-  sed -i '/argparse/d' oslo.config-$pkgver/requirements.txt
-
   cp -a oslo.config-$pkgver{,-py2}
   find oslo.config-$pkgver-py2 -name \*.py -exec sed -i '1s/python$/&2/' {} +
-
-  export PBR_VERSION=$pkgver
 }
 
 build() {
-  cd "$srcdir"/oslo.config-$pkgver
+  cd oslo.config-$pkgver
   python setup.py build
-
-  cd "$srcdir"/oslo.config-$pkgver-py2
-  python2 setup.py build
 }
 
 check() {
-  cd "$srcdir"/oslo.config-$pkgver
+  cd oslo.config-$pkgver
   stestr run
-
-  cd "$srcdir"/oslo.config-$pkgver-py2
-  PYTHON=python2 stestr2 run
 }
 
 package_python-oslo-config() {



More information about the arch-commits mailing list