commit e58deed068dd3ddbc97c72b1fbf71c66007d633e Author: Tim Biermann <tbier@posteo.de> Date: Sun Aug 27 14:04:25 2023 +0200 httpbin: 0.7.0 -> 0.10.1; new dependency: python3-brotlicffi diff --git a/httpbin/.footprint b/httpbin/.footprint index 3a1ae9a5e..575ec12f9 100644 --- a/httpbin/.footprint +++ b/httpbin/.footprint @@ -2,42 +2,44 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python3.10/ drwxr-xr-x root/root usr/lib/python3.10/site-packages/ -drwxr-xr-x root/root usr/lib/python3.10/site-packages/httpbin-0.7.0-py3.10.egg-info/ --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin-0.7.0-py3.10.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin-0.7.0-py3.10.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin-0.7.0-py3.10.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin-0.7.0-py3.10.egg-info/requires.txt --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin-0.7.0-py3.10.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python3.10/site-packages/httpbin-0.10.0.dist-info/ +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin-0.10.0.dist-info/AUTHORS +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin-0.10.0.dist-info/LICENSE +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin-0.10.0.dist-info/LICENSE.ISC +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin-0.10.0.dist-info/LICENSE.MIT +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin-0.10.0.dist-info/METADATA +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin-0.10.0.dist-info/RECORD +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin-0.10.0.dist-info/WHEEL +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin-0.10.0.dist-info/top_level.txt drwxr-xr-x root/root usr/lib/python3.10/site-packages/httpbin/ -rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__init__.py drwxr-xr-x root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/ --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/__init__.cpython-310.opt-1.pyc --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/__init__.cpython-310.pyc --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/core.cpython-310.opt-1.pyc --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/core.cpython-310.pyc --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/filters.cpython-310.opt-1.pyc --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/filters.cpython-310.pyc --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/helpers.cpython-310.opt-1.pyc --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/helpers.cpython-310.pyc --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/structures.cpython-310.opt-1.pyc --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/structures.cpython-310.pyc --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/utils.cpython-310.opt-1.pyc --rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/utils.cpython-310.pyc +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/__init__.cpython-310.opt-2.pyc +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/core.cpython-310.opt-2.pyc +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/filters.cpython-310.opt-2.pyc +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/helpers.cpython-310.opt-2.pyc +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/structures.cpython-310.opt-2.pyc +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/__pycache__/utils.cpython-310.opt-2.pyc -rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/core.py -rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/filters.py -rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/helpers.py +drwxr-xr-x root/root usr/lib/python3.10/site-packages/httpbin/static/ +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/static/favicon.ico -rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/structures.py drwxr-xr-x root/root usr/lib/python3.10/site-packages/httpbin/templates/ --rw-rw-r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/UTF-8-demo.txt --rwxrwxr-x root/root usr/lib/python3.10/site-packages/httpbin/templates/forms-post.html --rw-rw-r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/httpbin.1.html +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/UTF-8-demo.txt +drwxr-xr-x root/root usr/lib/python3.10/site-packages/httpbin/templates/flasgger/ +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/flasgger/index.html +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/footer.html +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/forms-post.html +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/httpbin.1.html drwxr-xr-x root/root usr/lib/python3.10/site-packages/httpbin/templates/images/ --rw-rw-r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/images/jackal.jpg --rw-rw-r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/images/pig_icon.png --rw-rw-r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/images/svg_logo.svg --rw-rw-r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/images/wolf_1.webp --rw-rw-r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/index.html --rw-rw-r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/moby.html --rw-rw-r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/sample.xml --rw-rw-r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/trackingscripts.html +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/images/jackal.jpg +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/images/pig_icon.png +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/images/svg_logo.svg +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/images/wolf_1.webp +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/index.html +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/moby.html +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/sample.xml +-rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/templates/trackingscripts.html -rw-r--r-- root/root usr/lib/python3.10/site-packages/httpbin/utils.py diff --git a/httpbin/.signature b/httpbin/.signature index 8c1ab20a4..20157dc1e 100644 --- a/httpbin/.signature +++ b/httpbin/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39Lbq8A4Wmt4Exe2CWHc296C8icGZx5KxJqoIytyDCPq27Iza9ZO8E9151t/iIx8m+UNreqkuY9Lgdm9dvF1mAM= -SHA256 (Pkgfile) = 2795604dc830454450e998ca93220e27ccecc56d0ad3ef5a4aa699a238a4bfc4 -SHA256 (.footprint) = 76875f070bed5e6f9315cc458202ba0f2de58061f69ccba43a165a5d01969c87 -SHA256 (httpbin-0.7.0.tar.gz) = 453cc4ce4686e4a54f5775877c7c1d841c5bc12a0da225e9f5655fb4846d0a49 -SHA256 (httpbin-werkzeug-0.15.1.patch) = 7d0262338e6cc7da107b5e211bbd4d8ce5ee1334f4a0c2d3bd6083155381ecb0 +RWSagIOpLGJF36HRB10q4heD/PZtRQdpO/XagZq7x76dro9RFn8sZoH+dzpH0+CRYNFGoNBdy2Oct9MShNuQR0A49/sG/DpPrQM= +SHA256 (Pkgfile) = bec68d9735d0473b3ccd20056121a3b2dc7c7064820b48f5b2abb8f94535c613 +SHA256 (.footprint) = 717e2c2db223d74673bdd2bb6a0fd44d4e06db726ea5ebc14371f879e16da0b4 +SHA256 (httpbin-0.10.1.tar.gz) = b7ddd607899284c79791366a561045a51d7b27270eae662fc22dfc40868484fb diff --git a/httpbin/Pkgfile b/httpbin/Pkgfile index 2177861e4..9c1e9e86e 100644 --- a/httpbin/Pkgfile +++ b/httpbin/Pkgfile @@ -1,22 +1,16 @@ # Description: HTTP Request and Response Service # URL: https://github.com/requests/httpbin # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: brotli python3-blinker python3-decorator python3-flasgger python3-gevent python3-raven +# Depends on: python3-brotlicffi python3-decorator python3-flasgger python3-gevent python3-raven name=httpbin -version=0.7.0 +version=0.10.1 release=1 -source=(https://github.com/requests/httpbin/archive/v$version/$name-$version.tar.gz - httpbin-werkzeug-0.15.1.patch) +source=(https://github.com/psf/httpbin/archive/release-$version/$name-$version.tar.g...) build() { - cd $name-$version + cd $name-release-$version - patch -Np1 -i $SRC/httpbin-werkzeug-0.15.1.patch - sed -i 's/brotlipy/Brotli/g' setup.py - LC_CTYPE=en_US.UTF-8 /usr/bin/python3 setup.py build - LC_CTYPE=en_US.UTF-8 /usr/bin/python3 setup.py install --prefix=/usr \ - --root=$PKG \ - -O1 \ - --skip-build + /usr/bin/python3 -m build --wheel --skip-dependency-check --no-isolation + /usr/bin/python3 -m installer --compile-bytecode 2 --destdir=$PKG dist/*.whl } diff --git a/httpbin/httpbin-werkzeug-0.15.1.patch b/httpbin/httpbin-werkzeug-0.15.1.patch deleted file mode 100644 index abca603a4..000000000 --- a/httpbin/httpbin-werkzeug-0.15.1.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b6cb2b47a3813da5df8dbffada284b72d7fe099e Mon Sep 17 00:00:00 2001 -From: Simon Kowallik <github@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'))