From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 19D781382C5 for ; Wed, 2 Dec 2020 09:51:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13915E087A; Wed, 2 Dec 2020 09:51:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DEB23E087A for ; Wed, 2 Dec 2020 09:51:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8629C340ED7 for ; Wed, 2 Dec 2020 09:51:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C2DB3B7 for ; Wed, 2 Dec 2020 09:51:04 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1606902661.e00d74a7cb0bec8ffcfb1b73afdd1e7ca68f809e.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/httpbin/, dev-python/httpbin/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch dev-python/httpbin/httpbin-0.7.0-r2.ebuild X-VCS-Directories: dev-python/httpbin/ dev-python/httpbin/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e00d74a7cb0bec8ffcfb1b73afdd1e7ca68f809e X-VCS-Branch: master Date: Wed, 2 Dec 2020 09:51:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 48f6b469-17c3-4c57-a331-060a5d63fed1 X-Archives-Hash: 9ad6df08f43d5440f74d58b41f3e51f5 commit: e00d74a7cb0bec8ffcfb1b73afdd1e7ca68f809e Author: Michał Górny gentoo org> AuthorDate: Wed Dec 2 09:45:52 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Dec 2 09:51:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e00d74a7 dev-python/httpbin: Support dev-python/brotlicffi Signed-off-by: Michał Górny gentoo.org> .../httpbin/files/httpbin-0.7.0-brotlicffi.patch | 43 ++++++++++++++++++++++ dev-python/httpbin/httpbin-0.7.0-r2.ebuild | 38 +++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch b/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch new file mode 100644 index 00000000000..f74474a70aa --- /dev/null +++ b/dev-python/httpbin/files/httpbin-0.7.0-brotlicffi.patch @@ -0,0 +1,43 @@ +From 69d1e62e69b7f886ebbb41b8e9aae62e76adf375 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +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 + diff --git a/dev-python/httpbin/httpbin-0.7.0-r2.ebuild b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild new file mode 100644 index 00000000000..c498e61cfdb --- /dev/null +++ b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild @@ -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