dev-python/httpbin: Support dev-python/brotlicffi

Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
2020-12-02 10:45:52 +01:00
parent ac1dcc634b
commit e00d74a7cb
2 changed files with 81 additions and 0 deletions

View File

@@ -0,0 +1,43 @@
From 69d1e62e69b7f886ebbb41b8e9aae62e76adf375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Wed, 2 Dec 2020 10:42:52 +0100
Subject: [PATCH] Replace brotlipy with brotlicffi
The brotlipy package has been renamed to brotlicffi. Update the imports
and dependencies accordingly. The major advanage of the new package
is that it no longer collides with the Python bindings provided
by brotli itself.
---
httpbin/filters.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/httpbin/filters.py b/httpbin/filters.py
index c6268b6..4deeaaa 100644
--- a/httpbin/filters.py
+++ b/httpbin/filters.py
@@ -10,7 +10,7 @@ This module provides response filter decorators.
import gzip as gzip2
import zlib
-import brotli as _brotli
+import brotlicffi as _brotli
from six import BytesIO
from decimal import Decimal
diff --git a/setup.py b/setup.py
index 7f9956b..8e17ef3 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ setup(
packages=find_packages(),
include_package_data = True, # include files listed in MANIFEST.in
install_requires=[
- 'Flask', 'MarkupSafe', 'decorator', 'itsdangerous', 'six', 'brotlipy',
+ 'Flask', 'MarkupSafe', 'decorator', 'itsdangerous', 'six', 'brotlicffi',
'raven[flask]', 'werkzeug>=0.14.1'
],
)
--
2.29.2

View File

@@ -0,0 +1,38 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6..9} pypy3 )
inherit distutils-r1
DESCRIPTION="HTTP Request and Response Service"
HOMEPAGE="https://github.com/postmanlabs/httpbin
https://pypi.org/project/httpbin/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
RDEPEND="
dev-python/brotlicffi[${PYTHON_USEDEP}]
dev-python/decorator[${PYTHON_USEDEP}]
dev-python/flask[${PYTHON_USEDEP}]
dev-python/itsdangerous[${PYTHON_USEDEP}]
dev-python/markupsafe[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
>=dev-python/werkzeug-0.14.1[${PYTHON_USEDEP}]"
PATCHES=(
# do not import raven if it's not going to be used
# (upstream removed it completely in git anyway)
"${FILESDIR}"/httpbin-0.7.0-optional-raven.patch
# fix tests with new versions of werkzeug
"${FILESDIR}"/httpbin-0.7.0-test-werkzeug.patch
# use brotlicffi instead of brotlipy
"${FILESDIR}"/httpbin-0.7.0-brotlicffi.patch
)
distutils_enable_tests unittest