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

[Thore Bödecker via arch-commits]

    Date: Tuesday, September 4, 2018 @ 12:39:34
  Author: foxxx0
Revision: 376622

upgpkg: python-cherrypy 18.0.0-1

update to 18.0.0, drop python2 to separate package

Modified:
  python-cherrypy/trunk/PKGBUILD

----------+
 PKGBUILD |   54 +++++++++++++++---------------------------------------
 1 file changed, 15 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2018-09-04 12:19:25 UTC (rev 376621)
+++ PKGBUILD    2018-09-04 12:39:34 UTC (rev 376622)
@@ -6,67 +6,43 @@
 # Contributor: Armando M. Baratti <amblis...@ajato.com.br>
 # Contributor: Florian Richter <florian_rich...@gmx.de>
 
-pkgbase='python-cherrypy'
-_pkgbase="${pkgbase#python-}"
-pkgname=("python-${_pkgbase}" "python2-${_pkgbase}")
-pkgver=17.3.0
+pkgname='python-cherrypy'
+_pkgname="${pkgname#python-}"
+pkgver=18.0.0
 pkgrel=1
 pkgdesc='A pythonic, object-oriented web development framework'
 arch=('any')
 url='https://cherrypy.org'
 license=('BSD')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-setuptools-scm'
-  'python2-setuptools-scm' 'python-six' 'python2-six' 'python-cheroot'
-  'python2-cheroot' 'python-portend' 'python2-portend')
-checkdepends=('python-tox' 'python2-tox')
-source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/${_pkgbase}/${_pkgbase}/archive/v$pkgver.tar.gz";)
-sha512sums=('779cf604c88104db89a9b3ff51f88fd9e307773c6bca2454ad4909ca9e366f0a895afb037450a87193622ea4a8e2812de924d8472dcf94488a4fe30912e73c09')
+depends=('python' 'python-six' 'python-cheroot' 'python-portend' 
'python-jaraco'
+  'python-more-itertools' 'python-zc.lockfile')
+makedepends=('python-setuptools' 'python-setuptools-scm' 'python-six'
+  'python-cheroot' 'python-portend' 'python-more-itertools' 
'python-zc.lockfile')
+checkdepends=('python-tox')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/v$pkgver.tar.gz";)
+sha512sums=('4c1ace8107a436214372b029ba89417b74c82438d281be648abae9f4aa07cae5d9187c0d2ce212125a16ca8acc09b2b26812cd3319386b4be3aa27548cdfa06b')
 
 prepare() {
-  cp -r "${srcdir}/${_pkgbase}-${pkgver}" "${srcdir}/${_pkgbase}-${pkgver}-py2"
-
-  # fix python interpreter for python2 stuff
-  find "${srcdir}/${_pkgbase}-${pkgver}-py2" -type f -name '*.py' \
-    -exec sed -i 's|^#!/usr/bin/python$|#!/usr/bin/env python2|1' {} +
+  :
 }
 
 build() {
   # setuptools wont find version from git tag
   export SETUPTOOLS_SCM_PRETEND_VERSION="${pkgver}"
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   python ./setup.py build
-
-  cd "${srcdir}/${_pkgbase}-${pkgver}-py2"
-  python2 ./setup.py build
 }
 
 check() {
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   tox
-
-  cd "${srcdir}/${_pkgbase}-${pkgver}-py2"
-  tox2
 }
 
-package_python-cherrypy() {
-  depends=('python' 'python-six' 'python-cheroot' 'python-portend' 
'python-jaraco')
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
 
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
-
   python ./setup.py install --root="${pkgdir}" --optimize=1
 
   install -Dm644 LICENSE.md \
     "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md"
 }
-
-package_python2-cherrypy() {
-  depends=('python2' 'python2-six' 'python2-cheroot' 'python2-portend' 
'python2-jaraco')
-
-  cd "${srcdir}/${_pkgbase}-${pkgver}-py2"
-
-  python2 ./setup.py install --root="${pkgdir}" --optimize=1
-  mv "${pkgdir}/usr/bin/cherryd" "${pkgdir}/usr/bin/cherryd2"
-
-  install -Dm644 LICENSE.md \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md"
-}