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

[Jelle van der Waa]

    Date: Tuesday, May 12, 2020 @ 18:31:04
  Author: jelle
Revision: 383312

upgpkg: python-beaker 1.11.0-4

Remove unused python2 module.

Modified:
  python-beaker/trunk/PKGBUILD

----------+
 PKGBUILD |   41 ++++++++++-------------------------------
 1 file changed, 10 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-12 18:04:28 UTC (rev 383311)
+++ PKGBUILD	2020-05-12 18:31:04 UTC (rev 383312)
@@ -2,22 +2,20 @@
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 # Contributor: Massimiliano Torromeo < massimiliano DOT torromeo AT gmail DOT com >
 
-pkgbase=python-beaker
-pkgname=('python-beaker' 'python2-beaker')
+pkgname=python-beaker
 pkgver=1.11.0
-pkgrel=3
+pkgrel=4
 arch=('any')
 license=('custom')
 pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications"
 url="http://beaker.groovie.org/"
-makedepends=('python-setuptools' 'python2-setuptools' 'python2-funcsigs')
-checkdepends=('python-nose' 'python2-nose' 'python-mock' 'python2-mock' 'python-sqlalchemy'
-              'python2-sqlalchemy' 'python-pycryptodome' 'python2-pycryptodome' 'python-coverage'
-              'python2-coverage' 'python-webtest' 'python2-webtest' 'python-redis' 'python2-redis'
-              'python-pymongo' 'python2-pymongo' 'python-pylibmc' 'python2-pylibmc' 'redis'
-              'python-cryptography' 'python2-cryptography' 'python-memcached' 'python2-memcached'
-              'memcached' 'pifpaf' 'python-mongomock' 'python2-mongomock')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/bbangert/beaker/archive/$pkgver.tar.gz")
+depends=('python')
+makedepends=('python-setuptools')
+checkdepends=('python-nose' 'python-mock' 'python-sqlalchemy'
+              'python-pycryptodome' 'python-coverage' 'python-webtest' 'python-redis'
+              'python-pymongo' 'python-pylibmc' 'redis' 'python-cryptography'
+              'python-memcached' 'memcached' 'pifpaf' 'python-mongomock')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/bbangert/beaker/archive/$pkgver.tar.gz")
 sha512sums=('0eab9ff40314786e0fb2d31a6b932f355680c193ac5c41de442ee5a3f4d5cf62ae1c30f2948f8e2c89c012bad5e4332a5a72be62c9b1cba0b9f2723afe7e9ae3')
 
 prepare() {
@@ -26,18 +24,12 @@
       -e "s|'mongodb://localhost:27017/beaker_testdb'|mongomock.MongoClient('mongodb://localhost:27017/beaker_testdb')|" \
       -i beaker-$pkgver/tests/test_managers/test_ext_mongodb.py
 
-  cp -a beaker-$pkgver{,-py2}
-
   sed -i "s#/usr/bin/python#/usr/bin/python3#" beaker-$pkgver/beaker/crypto/pbkdf2.py
-  sed -i "s#/usr/bin/python#/usr/bin/python2#" beaker-$pkgver-py2/beaker/crypto/pbkdf2.py
 }
 
 build() {
   cd "$srcdir"/beaker-$pkgver
   python3 setup.py build
-
-  cd "$srcdir"/beaker-$pkgver-py2
-  python2 setup.py build
 }
 
 check() {
@@ -45,23 +37,10 @@
 
   cd "$srcdir"/beaker-$pkgver
   pifpaf run memcached --port 11211 -- pifpaf run redis python setup.py nosetests || warning "Tests failed"
-
-  cd "$srcdir"/beaker-$pkgver-py2
-  pifpaf run memcached --port 11211 -- pifpaf run redis python2 setup.py nosetests || warning "Tests failed"
 }
 
-package_python-beaker() {
-  depends=('python')
-
+package() {
   cd beaker-$pkgver
   python setup.py install --root="$pkgdir" --optimize=1
   install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/python-beaker/LICENSE
 }
-
-package_python2-beaker() {
-  depends=('python2-funcsigs')
-
-  cd beaker-$pkgver-py2
-  python2 setup.py install --root="$pkgdir" --optimize=1
-  install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/python2-beaker/LICENSE
-}