From b3bc702a52de4654eaadd13c9f2b6a87528e9e12 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 22 Jan 2016 09:03:10 +0100 Subject: dev-python/requests: Fix version of urllib3 in deps Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher --- dev-python/requests/requests-2.9.1-r1.ebuild | 55 ---------------------------- dev-python/requests/requests-2.9.1-r2.ebuild | 55 ++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 dev-python/requests/requests-2.9.1-r1.ebuild create mode 100644 dev-python/requests/requests-2.9.1-r2.ebuild (limited to 'dev-python') diff --git a/dev-python/requests/requests-2.9.1-r1.ebuild b/dev-python/requests/requests-2.9.1-r1.ebuild deleted file mode 100644 index 3228f55e57b..00000000000 --- a/dev-python/requests/requests-2.9.1-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 - -DESCRIPTION="HTTP library for human beings" -HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="test" - -RDEPEND=" - app-misc/ca-certificates - >=dev-python/chardet-2.2.1[${PYTHON_USEDEP}] - dev-python/ndg-httpsclient[${PYTHON_USEDEP}] - >=dev-python/py-1.4.30[${PYTHON_USEDEP}] - dev-python/pyasn1[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.13[$(python_gen_usedep 'python*' pypy)] - dev-python/urllib3[${PYTHON_USEDEP}] - " -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - >=dev-python/pytest-2.8.1[${PYTHON_USEDEP}] - ) - " -# >=dev-python/pytest-httpbin-0.0.7[${PYTHON_USEDEP}] - -# tests connect to various remote sites -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${P}-system-packages.patch - "${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch -) - -python_prepare_all() { - # use system chardet & urllib3 - rm -r requests/packages/{chardet,urllib3} || die - - distutils-r1_python_prepare_all -} - -python_test() { - py.test -v || die -} diff --git a/dev-python/requests/requests-2.9.1-r2.ebuild b/dev-python/requests/requests-2.9.1-r2.ebuild new file mode 100644 index 00000000000..72d76c7eb9c --- /dev/null +++ b/dev-python/requests/requests-2.9.1-r2.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 + +DESCRIPTION="HTTP library for human beings" +HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +IUSE="test" + +RDEPEND=" + app-misc/ca-certificates + >=dev-python/chardet-2.2.1[${PYTHON_USEDEP}] + dev-python/ndg-httpsclient[${PYTHON_USEDEP}] + >=dev-python/py-1.4.30[${PYTHON_USEDEP}] + dev-python/pyasn1[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-0.13[$(python_gen_usedep 'python*' pypy)] + >=dev-python/urllib3-1.13.1-r1[${PYTHON_USEDEP}] + " +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + >=dev-python/pytest-2.8.1[${PYTHON_USEDEP}] + ) + " +# >=dev-python/pytest-httpbin-0.0.7[${PYTHON_USEDEP}] + +# tests connect to various remote sites +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${P}-system-packages.patch + "${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch +) + +python_prepare_all() { + # use system chardet & urllib3 + rm -r requests/packages/{chardet,urllib3} || die + + distutils-r1_python_prepare_all +} + +python_test() { + py.test -v || die +} -- cgit v1.2.1