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

[Antonio Rojas]

    Date: Friday, November 1, 2019 @ 08:09:44
  Author: arojas
Revision: 521748

Drop python 2

Modified:
  python-mamba/trunk/PKGBUILD

----------+
 PKGBUILD |   37 +++++++------------------------------
 1 file changed, 7 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-01 05:12:24 UTC (rev 521747)
+++ PKGBUILD	2019-11-01 08:09:44 UTC (rev 521748)
@@ -1,7 +1,6 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
-pkgbase=python-mamba
-pkgname=('python-mamba' 'python2-mamba')
+pkgname=python-mamba
 pkgver=0.10
 pkgrel=3
 pkgdesc="The definitive testing tool for Python. Born under the banner of Behavior Driven Development."
@@ -8,10 +7,9 @@
 arch=('any')
 license=('MIT')
 url="https://nestorsalceda.github.io/mamba"
-makedepends=('python-setuptools' 'python2-setuptools' 'python-clint' 'python2-clint'
-             'python-coverage' 'python2-coverage' 'python-watchdog' 'python2-watchdog')
-checkdepends=('python-doublex-expects' 'python2-doublex-expects')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/nestorsalceda/mamba/archive/v$pkgver.tar.gz"
+makedepends=('python-setuptools' 'python-clint' 'python-coverage' 'python-watchdog')
+checkdepends=('python-doublex-expects')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/nestorsalceda/mamba/archive/v$pkgver.tar.gz"
          mamba-python-3.8.patch)
 sha512sums=('f7a46c35359ed7703a4d3ebe51904fac6c125451001b5181d1d1038c46c3ac4940c378e08cd779e683aa76cd4553e078bfa7dfd5ea2301fa1dacb2a0a85ec38e'
             '6b48a483c052e8943e407036f45ef6eac94f7299e35396e7c740f99cf07d6ef37cdb948ff6bab6f6488f6181dd93defd8e80842d73d1193283da68b6de3b3ae7')
@@ -19,16 +17,11 @@
 prepare() {
   cd mamba-$pkgver
   patch -p1 -i ../mamba-python-3.8.patch # Add missing argument for python 3.8
-  cd ..
-  cp -a mamba-$pkgver{,-py2}
 }
 
 build() {
   cd "$srcdir"/mamba-$pkgver
   python setup.py build
-
-  cd "$srcdir"/mamba-$pkgver-py2
-  python2 setup.py build
 }
 
 check() {
@@ -38,19 +31,13 @@
   cd "$srcdir"/mamba-$pkgver
   python setup.py install --root="$PWD/tmp_install" --optimize=1
   (
-    export PATH="$PWD/tmp_install/usr/bin:$PATH" PYTHONPATH="$PWD/tmp_install/usr/lib/python3.8/site-packages:$PYTHONPATH"
+    local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
+    export PATH="$PWD/tmp_install/usr/bin:$PATH" PYTHONPATH="$PWD/tmp_install/${site-packages}:$PYTHONPATH"
     mamba --enable-coverage
   )
-
-  cd "$srcdir"/mamba-$pkgver-py2
-  python setup.py install --root="$PWD/tmp_install" --optimize=1
-  (
-    export PATH="$PWD/tmp_install/usr/bin:$PATH" PYTHONPATH="$PWD/tmp_install/usr/lib/python2.7/site-packages:$PYTHONPATH"
-    mamba --enable-coverage
-  )
 }
 
-package_python-mamba() {
+package() {
   depends=('python-coverage' 'python-watchdog' 'python-clint' 'python-setuptools')
 
   cd mamba-$pkgver
@@ -57,13 +44,3 @@
   python setup.py install --root="$pkgdir" --optimize=1
   install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-
-package_python2-mamba() {
-  depends=('python2-coverage' 'python2-watchdog' 'python2-clint' 'python2-setuptools')
-
-  cd mamba-$pkgver-py2
-  python2 setup.py install --root="$pkgdir" --optimize=1
-  install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-
-  mv "$pkgdir"/usr/bin/mamba{,2}
-}