Date: Wednesday, December 8, 2021 @ 19:05:47 Author: foutrelis Revision: 1065685
upgpkg: python-pecan 1.4.1-1: new upstream release Modified: python-pecan/trunk/PKGBUILD Deleted: python-pecan/trunk/python310.patch -----------------+ PKGBUILD | 14 ++------ python310.patch | 88 ------------------------------------------------------ 2 files changed, 4 insertions(+), 98 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-12-08 17:34:13 UTC (rev 1065684) +++ PKGBUILD 2021-12-08 19:05:47 UTC (rev 1065685) @@ -3,8 +3,8 @@ pkgname="python-pecan" _pkgname="${pkgname#python-}" pkgdesc='A WSGI object-dispatching web framework, designed to be lean and fast with few dependencies.' -pkgver=1.4.0 -pkgrel=5 +pkgver=1.4.1 +pkgrel=1 arch=('any') url='https://github.com/pecan/pecan' license=('BSD') @@ -15,17 +15,11 @@ checkdepends=('python-virtualenv' 'python-jinja' 'gunicorn' 'python-mock' 'python-sqlalchemy' 'python-genshi' 'python-nine' 'uwsgi' 'python-pytest' 'python-kajiki') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/${pkgver}.tar.gz" - ${pkgname}-sqlalchemy-1.4.patch::https://github.com/pecan/pecan/commit/a520bd544c0b.patch - python310.patch) -sha512sums=('3f7e072b294a732af6ff65621b1e10254260b9d42abd2bc38c3bff8e141b2ae4592567075813faf40227e7f0a3f2893c27270926fcfad18d1cdd9dc8a85bd14e' - 'aa71f0ae65d245afe6038f9765d557764cf8f80eb699e1b52fe71fb502d097f08ef638f11137b9a716f144de4077058a10fd0f2e57f82f8af79608cb63a0b99e' - '6e66a845d701aa63fadd67a8dd644956e7c444690a13fa0eafe6482e959c52318037c053c8fd8df503ffa293129d18858dc63fae6dc316ae3284c6e1753b5864') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/${pkgver}.tar.gz") +sha512sums=('4374fa306f2e3df454522dcc8a06ef275c68f8b40f3989d98034ed68ae1547d79dac95e157df8f72376d9a8215e6b23c1dbae68d181c16bd5eed3cc4c52c72dd') prepare(){ cd "${srcdir}/${_pkgname}-${pkgver}" - patch -Np1 -i ../${pkgname}-sqlalchemy-1.4.patch - patch -Np1 -i ../python310.patch # https://github.com/pecan/pecan/pull/131 # fix manpage build sed -i '/^dist = /d' docs/source/conf.py sed -i "s/^version = release = .*\$/version = release = '${pkgver}'/" docs/source/conf.py Deleted: python310.patch =================================================================== --- python310.patch 2021-12-08 17:34:13 UTC (rev 1065684) +++ python310.patch 2021-12-08 19:05:47 UTC (rev 1065685) @@ -1,88 +0,0 @@ -From f189d0eafbaacc5b5093bb8854cd2068e22b6c08 Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras <evange...@foutrelis.com> -Date: Wed, 8 Dec 2021 07:01:16 +0200 -Subject: [PATCH] Fix tests to work on Python 3.10 - -Python 3.10 adds the class name to the exception; adjust four tests -affected by this change. - -Fixes: https://github.com/pecan/pecan/issues/130 ---- - pecan/tests/test_base.py | 18 +++++++++++++----- - pecan/tests/test_no_thread_locals.py | 20 ++++++++++++++------ - 2 files changed, 27 insertions(+), 11 deletions(-) - -diff --git a/pecan/tests/test_base.py b/pecan/tests/test_base.py -index 11d0c4d..62d691e 100644 ---- a/pecan/tests/test_base.py -+++ b/pecan/tests/test_base.py -@@ -456,8 +456,12 @@ class TestControllerArguments(PecanTestCase): - assert type(ex) == TypeError - assert ex.args[0] in ( - "index() takes exactly 2 arguments (1 given)", -- "index() missing 1 required positional argument: 'id'" -- ) # this messaging changed in Python 3.3 -+ "index() missing 1 required positional argument: 'id'", -+ ( -+ "TestControllerArguments.app_.<locals>.RootController." -+ "index() missing 1 required positional argument: 'id'" -+ ), -+ ) # this messaging changed in Python 3.3 and again in Python 3.10 - - def test_single_argument(self): - r = self.app_.get('/1') -@@ -994,9 +998,13 @@ class TestControllerArguments(PecanTestCase): - except Exception as ex: - assert type(ex) == TypeError - assert ex.args[0] in ( -- "eater() takes at least 2 arguments (1 given)", -- "eater() missing 1 required positional argument: 'id'" -- ) # this messaging changed in Python 3.3 -+ "eater() takes exactly 2 arguments (1 given)", -+ "eater() missing 1 required positional argument: 'id'", -+ ( -+ "TestControllerArguments.app_.<locals>.RootController." -+ "eater() missing 1 required positional argument: 'id'" -+ ), -+ ) # this messaging changed in Python 3.3 and again in Python 3.10 - - def test_one_remainder(self): - r = self.app_.get('/eater/1') -diff --git a/pecan/tests/test_no_thread_locals.py b/pecan/tests/test_no_thread_locals.py -index aa8e461..3fbcd88 100644 ---- a/pecan/tests/test_no_thread_locals.py -+++ b/pecan/tests/test_no_thread_locals.py -@@ -361,9 +361,13 @@ class TestControllerArguments(PecanTestCase): - except Exception as ex: - assert type(ex) == TypeError - assert ex.args[0] in ( -- "index() takes exactly 4 arguments (3 given)", -- "index() missing 1 required positional argument: 'id'" -- ) # this messaging changed in Python 3.3 -+ "index() takes exactly 2 arguments (1 given)", -+ "index() missing 1 required positional argument: 'id'", -+ ( -+ "TestControllerArguments.app_.<locals>.RootController." -+ "index() missing 1 required positional argument: 'id'" -+ ), -+ ) # this messaging changed in Python 3.3 and again in Python 3.10 - - def test_single_argument(self): - r = self.app_.get('/1') -@@ -763,9 +767,13 @@ class TestControllerArguments(PecanTestCase): - except Exception as ex: - assert type(ex) == TypeError - assert ex.args[0] in ( -- "eater() takes at least 4 arguments (3 given)", -- "eater() missing 1 required positional argument: 'id'" -- ) # this messaging changed in Python 3.3 -+ "eater() takes exactly 2 arguments (1 given)", -+ "eater() missing 1 required positional argument: 'id'", -+ ( -+ "TestControllerArguments.app_.<locals>.RootController." -+ "eater() missing 1 required positional argument: 'id'" -+ ), -+ ) # this messaging changed in Python 3.3 and again in Python 3.10 - - def test_one_remainder(self): - r = self.app_.get('/eater/1')