[arch-commits] Commit in apache-libcloud/trunk (PKGBUILD)

Felix Yan felixonmars at archlinux.org
Tue Feb 19 16:20:31 UTC 2019


    Date: Tuesday, February 19, 2019 @ 16:20:30
  Author: felixonmars
Revision: 434563

remove python2 sibling

Modified:
  apache-libcloud/trunk/PKGBUILD

----------+
 PKGBUILD |   40 ++++++++--------------------------------
 1 file changed, 8 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-19 16:07:37 UTC (rev 434562)
+++ PKGBUILD	2019-02-19 16:20:30 UTC (rev 434563)
@@ -3,17 +3,16 @@
 # Contributor: Lex Black <autumn-wind at web dot de>
 # Contributor: Alasdair Haswell <ali at arhaswell dot co dot uk>
 
-pkgbase=apache-libcloud
-pkgname=('python-apache-libcloud' 'python2-apache-libcloud')
+pkgname=python-apache-libcloud
 pkgver=2.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A standard Python library that abstracts away differences among multiple cloud provider APIs"
 arch=('any')
 url="https://libcloud.apache.org"
 license=('Apache')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-requests' 'python2-requests')
-checkdepends=('python-mock' 'python2-mock' 'python-pytest-runner' 'python2-pytest-runner' 'openssh'
-              'python-requests-mock' 'python2-requests-mock')
+depends=('python-requests')
+makedepends=('python-setuptools')
+checkdepends=('python-mock' 'python-pytest-runner' 'openssh' 'python-requests-mock')
 source=("https://pypi.io/packages/source/a/apache-libcloud/apache-libcloud-${pkgver}.tar.gz"{,.asc})
 sha512sums=('0926164a2514bc3e292c06d83713fb07204b747f06b34e25daead272b33eeb568d803babc7c971a85be0ecf0f425b90a1209b8f9beea94f42dc3522271292be1'
             'SKIP')
@@ -20,42 +19,19 @@
 validpgpkeys=('3ACBB4086C01F7376628088CAB4A19AE1CE85744'  # Anthony Shaw <anthonyshaw at apache.org>
               '35542BB9C0C01D5E5478BADE6A61AF8545413203') # Quentin Pradet <quentin.pradet at gmail.com>
 
-prepare() {
-  cp -a apache-libcloud-$pkgver{,-py2}
-}
-
 build() {
-  cd "$srcdir/apache-libcloud-$pkgver"
+  cd apache-libcloud-$pkgver
   python setup.py build
-
-  cd "$srcdir/apache-libcloud-$pkgver-py2"
-  python2 setup.py build
 }
 
 check() {
-  cd "$srcdir/apache-libcloud-$pkgver"
+  cd apache-libcloud-$pkgver
   cp libcloud/test/secrets.py-dist libcloud/test/secrets.py
   python setup.py test
   rm libcloud/test/secrets.py
-
-  cd "$srcdir/apache-libcloud-$pkgver-py2"
-  cp libcloud/test/secrets.py-dist libcloud/test/secrets.py
-  python2 setup.py test
-  rm libcloud/test/secrets.py
 }
 
-package_python-apache-libcloud() {
-  depends=('python-requests')
-
+package() {
   cd apache-libcloud-$pkgver
   python setup.py install --root="$pkgdir"
 }
-
-package_python2-apache-libcloud() {
-  depends=('python2-requests')
-  replaces=('apache-libcloud')
-  conflicts=('apache-libcloud')
-
-  cd apache-libcloud-$pkgver-py2
-  python2 setup.py install --root="$pkgdir"
-}



More information about the arch-commits mailing list