[arch-commits] Commit in python-paste/trunk (PKGBUILD python3.7.patch)

[Felix Yan]

    Date: Thursday, November 1, 2018 @ 11:15:04
  Author: felixonmars
Revision: 401069

upgpkg: python-paste 3.0.2-1

Modified:
  python-paste/trunk/PKGBUILD
Deleted:
  python-paste/trunk/python3.7.patch

-----------------+
 PKGBUILD        |   22 +++++++++-------------
 python3.7.patch |   22 ----------------------
 2 files changed, 9 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-01 11:14:05 UTC (rev 401068)
+++ PKGBUILD	2018-11-01 11:15:04 UTC (rev 401069)
@@ -4,27 +4,23 @@
 
 pkgbase=python-paste
 pkgname=(python-paste python2-paste)
-pkgver=2.0.3
-pkgrel=3
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Tools for using a Web Server Gateway Interface stack"
 arch=('any')
 url="http://pythonpaste.org/index.html"
 license=('MIT')
 makedepends=('python-setuptools' 'python2-setuptools' 'python-six' 'python2-six')
-checkdepends=('python-nose' 'python2-nose')
+checkdepends=('python-pytest-runner' 'python2-pytest-runner')
 optdepends=('python2-flup: WSGI utilities'
             'python-openid: Support for OpenID')
-source=("https://files.pythonhosted.org/packages/source/P/Paste/Paste-${pkgver}.tar.gz"
-        python3.7.patch)
-md5sums=('1231e14eae62fa7ed76e9130b04bc61e'
-         'eaec86c9ff3da59a784163d6252bb18f')
+source=("https://files.pythonhosted.org/packages/source/P/Paste/Paste-${pkgver}.tar.gz")
+sha512sums=('cd825a4c9bbadf6d6f69eb2de18dd5b4ec8dd433981bed2432f784a58b4991155184afd20e9f15719ed22ae54760c0f75ac919c99fa3ed46ade34136207547ed')
 
 prepare() {
-  rm Paste-${pkgver}/paste/httpserver.py.orig
+  # https://github.com/cdent/paste/pull/13
+  sed -i 's/nose/pytest/' Paste-${pkgver}/setup.py
 
-  # https://bitbucket.org/ianb/paste/pull-requests/41
-  patch -d Paste-${pkgver} -Np1 < python3.7.patch
-
   cp -a Paste-${pkgver}{,-py2}
 
   cd Paste-${pkgver}-py2
@@ -46,10 +42,10 @@
   # redirects to web.archive.org, and thus breaks the test
 
   cd "$srcdir"/Paste-$pkgver
-  PYTHONPATH="$PWD/build/lib:$PYTHONPATH" nosetests3 -e '.*test_paste_website'
+  python setup.py pytest
 
   cd "$srcdir"/Paste-$pkgver-py2
-  PYTHONPATH="$PWD/build/lib:$PYTHONPATH" nosetests2 -e '.*test_paste_website'
+  python2 setup.py pytest
 }
 
 package_python-paste() {

Deleted: python3.7.patch
===================================================================
--- python3.7.patch	2018-11-01 11:14:05 UTC (rev 401068)
+++ python3.7.patch	2018-11-01 11:15:04 UTC (rev 401069)
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User Miro Hrončok <miro at hroncok.cz>
-# Date 1528476582 -7200
-# Branch py37
-# Node ID c5a2c7e3191cdcebf3fa5f0e52f55910ed2120b9
-# Parent  0e5a48796ab969d874c6b772c5c33561ac2d1b0d
-Don't raise StopIteration from generator, return instead
-
-See https://www.python.org/dev/peps/pep-0479/
-
-diff --git a/paste/auth/digest.py b/paste/auth/digest.py
---- a/paste/auth/digest.py
-+++ b/paste/auth/digest.py
-@@ -57,7 +57,7 @@
-         prev = item
- 
-     yield prev.strip()
--    raise StopIteration
-+    return
- 
- def _auth_to_kv_pairs(auth_string):
-     """ split a digest auth string into key, value pairs """