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

[Thore Bödecker]

    Date: Tuesday, July 24, 2018 @ 14:15:01
  Author: foxxx0
Revision: 363293

upgpkg: python-cherrypy 17.0.0-1

update to 17.0.0

Modified:
  python-cherrypy/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-24 13:43:51 UTC (rev 363292)
+++ PKGBUILD	2018-07-24 14:15:01 UTC (rev 363293)
@@ -7,13 +7,13 @@
 # Contributor: Florian Richter <Florian_Richter at gmx.de>
 
 pkgbase='python-cherrypy'
-_pkgbase="${pkgbase//python-/}"
-pkgname=('python-cherrypy' 'python2-cherrypy')
-pkgver=16.0.3
-pkgrel=2
-pkgdesc="A pythonic, object-oriented web development framework"
+_pkgbase="${pkgbase#python-}"
+pkgname=("python-${_pkgbase}" "python2-${_pkgbase}")
+pkgver=17.0.0
+pkgrel=1
+pkgdesc='A pythonic, object-oriented web development framework'
 arch=('any')
-url="https://cherrypy.org"
+url='https://cherrypy.org'
 license=('BSD')
 makedepends=('python-setuptools' 'python2-setuptools' 'python-setuptools-scm'
   'python2-setuptools-scm' 'python-six' 'python2-six' 'python-cheroot'
@@ -20,18 +20,17 @@
   '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=('897c7ae982f02dbae4226ecff37d2b2c8b39e63929fde8bbf34b7c5996f89fe5a89ab5f399001ede8bd0352442fba223ca4518523ed0a88240887fe099ddaf2a')
+sha512sums=('a80cbca34a1fe66a0dd83dce1d241f9b4b0c949fa05c9f982f8785c164debf969f4f222ec9e05a8e37fa272ea459e13bb06c50850dcfb87c0a281a67dd0673e6')
 
 prepare() {
   cp -r "${srcdir}/${_pkgbase}-${pkgver}" "${srcdir}/${_pkgbase}-${pkgver}-py2"
 
-  # disable broken tests
-  rm "${srcdir}/${_pkgbase}-${pkgver}/${_pkgbase}/test"/test_{objectmapping.py,request_obj.py}
-  rm "${srcdir}/${_pkgbase}-${pkgver}-py2/${_pkgbase}/test"/test_{encoding.py,objectmapping.py,request_obj.py}
+  # 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}"
@@ -38,8 +37,6 @@
   python ./setup.py build
 
   cd "${srcdir}/${_pkgbase}-${pkgver}-py2"
-  # fix incorrect shebang
-  sed -i 's|#!/usr/bin/python$|#!/usr/bin/python2|' cherrypy/test/sessiondemo.py
   python2 ./setup.py build
 }