From 674df0c50ff2560fc253f2ab1e2488bd47b21ad9 Mon Sep 17 00:00:00 2001 From: foutrelis Date: Sun, 12 Dec 2021 22:53:26 +0000 Subject: [PATCH] db-move: moved httpbin from [community-testing] to [community] (any) git-svn-id: file:///srv/repos/svn-community/svn@1069444 9fca08f4-af9d-4005-b8df-a31f2cc04f65 --- repos/community-any/PKGBUILD | 14 +++--- .../httpbin-werkzeug-2.0.0.patch | 0 repos/community-testing-any/PKGBUILD | 45 ------------------- .../httpbin-werkzeug-0.15.1.patch | 34 -------------- 4 files changed, 9 insertions(+), 84 deletions(-) rename repos/{community-testing-any => community-any}/httpbin-werkzeug-2.0.0.patch (100%) delete mode 100644 repos/community-testing-any/PKGBUILD delete mode 100644 repos/community-testing-any/httpbin-werkzeug-0.15.1.patch diff --git a/repos/community-any/PKGBUILD b/repos/community-any/PKGBUILD index 49a610bde07b..ad7a37a03ad6 100644 --- a/repos/community-any/PKGBUILD +++ b/repos/community-any/PKGBUILD @@ -2,7 +2,7 @@ pkgname=httpbin pkgver=0.7.0 -pkgrel=6 +pkgrel=8 pkgdesc="HTTP Request and Response Service" arch=('any') url="https://github.com/requests/httpbin" @@ -12,13 +12,17 @@ depends=('python-flask' 'python-markupsafe' 'python-itsdangerous' 'python-six' ' 'python-blinker') 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-0.15.1.patch + httpbin-werkzeug-2.0.0.patch) sha512sums=('faec48a0a2ac8800293b10281966a28195884ad2f69f0f28f1b8c8e1a7bfd8933ebbc9b541c80cdc19e1031a8ba9383afe8e372b9044436cb307dd1e8eddaae7' - '3c058ca5f685e281f7d60216de844e58727e7677766660df410ec57d8c985485cf611ec64eb71a234bdd49b4fdf66be6138d4bb7258d9e6d0346d6c6ee9f3cdf') + '3c058ca5f685e281f7d60216de844e58727e7677766660df410ec57d8c985485cf611ec64eb71a234bdd49b4fdf66be6138d4bb7258d9e6d0346d6c6ee9f3cdf' + '25aced8dc34ed517ba7304d86d7e32fc49282262512962edf743265c78f3c5a2e3324902ec76ea121c11a9af0219d8c4e506ce301ad625d9e72f07491b8cbe49') prepare() { - patch -d httpbin-$pkgver -p1 -i ../httpbin-werkzeug-0.15.1.patch - sed -i 's/brotlipy/Brotli/g' httpbin-$pkgver/setup.py + cd httpbin-$pkgver + patch -p1 -i ../httpbin-werkzeug-0.15.1.patch + patch -p1 -i ../httpbin-werkzeug-2.0.0.patch + sed -i 's/brotlipy/Brotli/g' setup.py } build() { diff --git a/repos/community-testing-any/httpbin-werkzeug-2.0.0.patch b/repos/community-any/httpbin-werkzeug-2.0.0.patch similarity index 100% rename from repos/community-testing-any/httpbin-werkzeug-2.0.0.patch rename to repos/community-any/httpbin-werkzeug-2.0.0.patch diff --git a/repos/community-testing-any/PKGBUILD b/repos/community-testing-any/PKGBUILD deleted file mode 100644 index ad7a37a03ad6..000000000000 --- a/repos/community-testing-any/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# Maintainer: Felix Yan - -pkgname=httpbin -pkgver=0.7.0 -pkgrel=8 -pkgdesc="HTTP Request and Response Service" -arch=('any') -url="https://github.com/requests/httpbin" -license=('MIT') -depends=('python-flask' 'python-markupsafe' 'python-itsdangerous' 'python-six' 'python-decorator' - 'python-brotli' 'python-raven' 'python-werkzeug' 'python-gevent' 'python-flasgger' - 'python-blinker') -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.0.0.patch) -sha512sums=('faec48a0a2ac8800293b10281966a28195884ad2f69f0f28f1b8c8e1a7bfd8933ebbc9b541c80cdc19e1031a8ba9383afe8e372b9044436cb307dd1e8eddaae7' - '3c058ca5f685e281f7d60216de844e58727e7677766660df410ec57d8c985485cf611ec64eb71a234bdd49b4fdf66be6138d4bb7258d9e6d0346d6c6ee9f3cdf' - '25aced8dc34ed517ba7304d86d7e32fc49282262512962edf743265c78f3c5a2e3324902ec76ea121c11a9af0219d8c4e506ce301ad625d9e72f07491b8cbe49') - -prepare() { - cd httpbin-$pkgver - patch -p1 -i ../httpbin-werkzeug-0.15.1.patch - patch -p1 -i ../httpbin-werkzeug-2.0.0.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: diff --git a/repos/community-testing-any/httpbin-werkzeug-0.15.1.patch b/repos/community-testing-any/httpbin-werkzeug-0.15.1.patch deleted file mode 100644 index abca603a40c3..000000000000 --- a/repos/community-testing-any/httpbin-werkzeug-0.15.1.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b6cb2b47a3813da5df8dbffada284b72d7fe099e Mon Sep 17 00:00:00 2001 -From: Simon Kowallik -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'))