Date: Sunday, April 9, 2023 @ 04:08:50 Author: felixonmars Revision: 1443087
archrelease: copy trunk to community-staging-any Added: httpbin/repos/community-staging-any/ httpbin/repos/community-staging-any/PKGBUILD (from rev 1443083, httpbin/trunk/PKGBUILD) httpbin/repos/community-staging-any/httpbin-werkzeug-0.15.1.patch (from rev 1443083, httpbin/trunk/httpbin-werkzeug-0.15.1.patch) httpbin/repos/community-staging-any/httpbin-werkzeug-2.1.0.patch (from rev 1443085, httpbin/trunk/httpbin-werkzeug-2.1.0.patch) httpbin/repos/community-staging-any/remove-raven.patch (from rev 1443085, httpbin/trunk/remove-raven.patch) -------------------------------+ PKGBUILD | 50 ++++++++++++++++++++++++++++++++++++++++ httpbin-werkzeug-0.15.1.patch | 34 +++++++++++++++++++++++++++ httpbin-werkzeug-2.1.0.patch | 32 +++++++++++++++++++++++++ remove-raven.patch | 47 +++++++++++++++++++++++++++++++++++++ 4 files changed, 163 insertions(+) Copied: httpbin/repos/community-staging-any/PKGBUILD (from rev 1443083, httpbin/trunk/PKGBUILD) =================================================================== --- community-staging-any/PKGBUILD (rev 0) +++ community-staging-any/PKGBUILD 2023-04-09 04:08:50 UTC (rev 1443087) @@ -0,0 +1,50 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=httpbin +pkgver=0.7.0 +pkgrel=12 +pkgdesc="HTTP Request and Response Service" +arch=('any') +url="https://github.com/requests/httpbin" +license=('MIT') +depends=('python-flask' 'python-markupsafe' 'python-decorator' 'python-itsdangerous' 'python-six' + 'python-brotli' 'python-werkzeug') +makedepends=('python-setuptools') +source=("$pkgname-$pkgver.tar.gz::https://github.com/requests/httpbin/archive/v$pkgver.tar.gz" + httpbin-werkzeug-0.15.1.patch + httpbin-werkzeug-2.1.0.patch + remove-raven.patch) +sha512sums=('faec48a0a2ac8800293b10281966a28195884ad2f69f0f28f1b8c8e1a7bfd8933ebbc9b541c80cdc19e1031a8ba9383afe8e372b9044436cb307dd1e8eddaae7' + '3c058ca5f685e281f7d60216de844e58727e7677766660df410ec57d8c985485cf611ec64eb71a234bdd49b4fdf66be6138d4bb7258d9e6d0346d6c6ee9f3cdf' + '297902e60a529ad9b7c3ad1cc36a2c958505a0a15bc1e0210cb365a6a4d9dffcde793dad0b426ab14b0f312cd3d9fa34a6662040d665dd5177376a8583945789' + '757db19d3ded4806423f3361b5d30c962d8a72a9b3bf6afb26770f3fc56c14554c8fc6aa1a6ce72328fd8c77c330c5d0d05478d345c287f07e22302ccf1ec8d3') + +prepare() { + cd httpbin-$pkgver + patch -p1 -i ../httpbin-werkzeug-0.15.1.patch + # patch taken from https://github.com/maximino-dev/httpbin/commit/651c03a73072b9f399bbb80741ab473fc8b0adbb, + # which is the latest version of https://github.com/postmanlabs/httpbin/pull/674 as of 2022/11/13 + patch -p1 -i ../httpbin-werkzeug-2.1.0.patch + # raven is unmaintained and httpbin removed it already, but no release was made + patch -p1 -i ../remove-raven.patch + sed -i 's/brotlipy/Brotli/g' setup.py +} + +build() { + cd httpbin-$pkgver + LC_CTYPE=en_US.UTF-8 python setup.py build +} + +check() { + cd httpbin-$pkgver + python test_httpbin.py +} + +package() { + cd httpbin-$pkgver + LC_CTYPE=en_US.UTF-8 python setup.py install -O1 --root="$pkgdir" + + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 et: Copied: httpbin/repos/community-staging-any/httpbin-werkzeug-0.15.1.patch (from rev 1443083, httpbin/trunk/httpbin-werkzeug-0.15.1.patch) =================================================================== --- community-staging-any/httpbin-werkzeug-0.15.1.patch (rev 0) +++ community-staging-any/httpbin-werkzeug-0.15.1.patch 2023-04-09 04:08:50 UTC (rev 1443087) @@ -0,0 +1,34 @@ +From b6cb2b47a3813da5df8dbffada284b72d7fe099e Mon Sep 17 00:00:00 2001 +From: Simon Kowallik <git...@simonkowallik.com> +Date: Sat, 18 May 2019 13:10:08 +0200 +Subject: [PATCH 1/2] fix #554: update tests, Pipfile, Pipfile.lock for + werkzeug>=0.15.1 + +- update test_httpbin.py to reflect new behaviour of werkzeug +- require werkzeug>=0.15.1 +--- + Pipfile | 2 +- + Pipfile.lock | 6 +++--- + test_httpbin.py | 2 -- + 3 files changed, 4 insertions(+), 6 deletions(-) + +diff --git a/test_httpbin.py b/test_httpbin.py +index b7104ff..ea51ae8 100755 +--- a/test_httpbin.py ++++ b/test_httpbin.py +@@ -148,7 +148,6 @@ def test_get(self): + data = json.loads(response.data.decode('utf-8')) + self.assertEqual(data['args'], {}) + self.assertEqual(data['headers']['Host'], 'localhost') +- self.assertEqual(data['headers']['Content-Length'], '0') + self.assertEqual(data['headers']['User-Agent'], 'test') + # self.assertEqual(data['origin'], None) + self.assertEqual(data['url'], 'http://localhost/get') +@@ -162,7 +161,6 @@ def test_anything(self): + data = json.loads(response.data.decode('utf-8')) + self.assertEqual(data['args'], {}) + self.assertEqual(data['headers']['Host'], 'localhost') +- self.assertEqual(data['headers']['Content-Length'], '0') + self.assertEqual(data['url'], 'http://localhost/anything/foo/bar') + self.assertEqual(data['method'], 'GET') + self.assertTrue(response.data.endswith(b'\n')) Copied: httpbin/repos/community-staging-any/httpbin-werkzeug-2.1.0.patch (from rev 1443085, httpbin/trunk/httpbin-werkzeug-2.1.0.patch) =================================================================== --- community-staging-any/httpbin-werkzeug-2.1.0.patch (rev 0) +++ community-staging-any/httpbin-werkzeug-2.1.0.patch 2023-04-09 04:08:50 UTC (rev 1443087) @@ -0,0 +1,32 @@ +From 651c03a73072b9f399bbb80741ab473fc8b0adbb Mon Sep 17 00:00:00 2001 +From: Maximino BOGADO <bogam...@hotmail.fr> +Date: Wed, 30 Mar 2022 16:26:31 +0200 +Subject: [PATCH] Replace BaseResponse to Response class (new werkzeug version + 2.1.0) + +--- + httpbin/core.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/httpbin/core.py b/httpbin/core.py +index 305c9882..ef694f62 100644 +--- a/httpbin/core.py ++++ b/httpbin/core.py +@@ -29,7 +29,7 @@ + from six.moves import range as xrange + from werkzeug.datastructures import WWWAuthenticate, MultiDict + from werkzeug.http import http_date +-from werkzeug.wrappers import BaseResponse ++from werkzeug.wrappers import Response as WzResponse + from werkzeug.http import parse_authorization_header + from flasgger import Swagger, NO_SANITIZER + +@@ -77,7 +77,7 @@ def jsonify(*args, **kwargs): + + + # Prevent WSGI from correcting the casing of the Location header +-BaseResponse.autocorrect_location_header = False ++WzResponse.autocorrect_location_header = False + + # Find the correct template folder when running from a different location + tmpl_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "templates") Copied: httpbin/repos/community-staging-any/remove-raven.patch (from rev 1443085, httpbin/trunk/remove-raven.patch) =================================================================== --- community-staging-any/remove-raven.patch (rev 0) +++ community-staging-any/remove-raven.patch 2023-04-09 04:08:50 UTC (rev 1443087) @@ -0,0 +1,47 @@ +From e5433806757a09d58e48935c081db80170296ab5 Mon Sep 17 00:00:00 2001 +From: Kenneth Reitz <m...@kennethreitz.org> +Date: Wed, 9 May 2018 06:30:24 -0400 +Subject: [PATCH] remove raven + +Signed-off-by: Kenneth Reitz <m...@kennethreitz.org> +--- + Pipfile | 1 - + Pipfile.lock | 15 +-------------- + httpbin/core.py | 1 - + 3 files changed, 1 insertion(+), 16 deletions(-) + +diff --git a/httpbin/core.py b/httpbin/core.py +index e22fea50..14f2d06e 100644 +--- a/httpbin/core.py ++++ b/httpbin/core.py +@@ -21,7 +21,6 @@ + from werkzeug.http import http_date + from werkzeug.wrappers import BaseResponse + from werkzeug.http import parse_authorization_header +-from raven.contrib.flask import Sentry + + from . import filters + from .helpers import get_headers, status_code, get_dict, get_request_range, check_basic_auth, check_digest_auth, \ + +From 3ed599e50915577e1fecb988a7dedb092e98c7c8 Mon Sep 17 00:00:00 2001 +From: Chih-Hsuan Yen <yan12...@gmail.com> +Date: Mon, 13 May 2019 22:18:14 +0800 +Subject: [PATCH] Remove raven from setup.py + +Usage of raven is removed in https://github.com/postmanlabs/httpbin/commit/e5433806757a09d58e48935c081db80170296ab5 +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index afbef584..de46fc2a 100644 +--- a/setup.py ++++ b/setup.py +@@ -36,6 +36,6 @@ + include_package_data = True, # include files listed in MANIFEST.in + install_requires=[ + 'Flask', 'MarkupSafe', 'decorator', 'itsdangerous', 'six', 'brotlipy', +- 'raven[flask]', 'werkzeug>=0.14.1' ++ 'werkzeug>=0.14.1' + ], + )