* [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/, dev-python/requests/files/
@ 2021-11-27 10:27 Michał Górny
0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2021-11-27 10:27 UTC (permalink / raw
To: gentoo-commits
commit: 3c8b7b7f3b9952668ebc9aa50c009db2e641ae0f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 27 09:58:12 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 27 10:27:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c8b7b7f
dev-python/requests: Support running tests without trustme
In preperation for trustme losing keywords due to Rust requirement, make
it possible to run the vast majority of requests' tests without it (only
one test requires the dependency).
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/requests-2.26.0-trustme-dep.patch | 37 ++++++++++++++++++++++
dev-python/requests/requests-2.26.0.ebuild | 5 +--
2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/dev-python/requests/files/requests-2.26.0-trustme-dep.patch b/dev-python/requests/files/requests-2.26.0-trustme-dep.patch
new file mode 100644
index 000000000000..b3a81659a9be
--- /dev/null
+++ b/dev-python/requests/files/requests-2.26.0-trustme-dep.patch
@@ -0,0 +1,37 @@
+From 6a1b5cbc124e0c3362ddefae5939db5c216a74db Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 27 Nov 2021 10:33:35 +0100
+Subject: [PATCH] Skip the test requiring trustme when it is not available
+
+Modify the nosan_server fixture to cause test_https_warnings to be
+skipped when trustme is not installed on the system, rather than causing
+the whole test suite to fail unconditionally. This makes it possible
+to run all the remaining tests on systems where trustme cannot be
+installed due to its dependencies.
+---
+ tests/conftest.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 099462cf..5d38f254 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -13,7 +13,6 @@ import threading
+
+ import pytest
+ from requests.compat import urljoin
+-import trustme
+
+
+ def prepare_url(value):
+@@ -38,6 +37,7 @@ def httpbin_secure(httpbin_secure):
+
+ @pytest.fixture
+ def nosan_server(tmp_path_factory):
++ trustme = pytest.importorskip('trustme')
+ tmpdir = tmp_path_factory.mktemp("certs")
+ ca = trustme.CA()
+ # only commonName, no subjectAltName
+--
+2.34.1
+
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index 911ddfa1be0d..d30d1f190284 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -39,10 +39,11 @@ distutils_enable_tests pytest
PATCHES=(
"${FILESDIR}"/${P}-test.patch
+ "${FILESDIR}"/${P}-trustme-dep.patch
)
python_test() {
- local deselect=(
+ local EPYTEST_DESELECT=(
# Internet
requests/__init__.py::requests
requests/api.py::requests.api.request
@@ -55,5 +56,5 @@ python_test() {
tests/test_requests.py::TestRequests::test_pyopenssl_redirect
)
- epytest ${deselect[@]/#/--deselect }
+ epytest
}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/, dev-python/requests/files/
@ 2024-05-21 12:44 Michał Górny
0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2024-05-21 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 5f630f56d04725e89ed88d0d1b2ad32a5574617a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 21 12:09:05 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 21 12:44:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f630f56
dev-python/requests: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/requests/Manifest | 1 -
.../requests-2.28.0-drop-dependency-warnings.patch | 21 ------
dev-python/requests/requests-2.31.0.ebuild | 86 ----------------------
3 files changed, 108 deletions(-)
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index eeb595216333..3ed4eae42379 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,2 +1 @@
-DIST requests-2.31.0.tar.gz 110794 BLAKE2B e4e2781b272ccd94230c5b8c1bea83901bc8c28a34880709dbb95b887417b47833512e25045dab6e4226295294e2bf56fc821b6f636ae28aefdeee6039f53d44 SHA512 ce50d64973752f4cf7f7c7c91401669854b55c66d7465bea3689772fae8a6b646cf6720d84a2984bbe6fd78fc8b9ce0aa377f291fb6d7c20c7c2a4be8193acdd
DIST requests-2.32.1.tar.gz 129920 BLAKE2B 9f46afeb3ea62e8bb537fb793bcf1b65b5cc2ae3f22263151b0bf5879aa2a11a1e87777453cc325f552964551750ef81524ef99ce132bb19df5161e1df5fe77f SHA512 6ae12ca26f04c3c001ef1882d17cd7f12412114214961db42d6b5f3f507640d1f07e325034761e02e7e5d9daacaab10a16884c2cb2c4128ca059a142b52bace8
diff --git a/dev-python/requests/files/requests-2.28.0-drop-dependency-warnings.patch b/dev-python/requests/files/requests-2.28.0-drop-dependency-warnings.patch
deleted file mode 100644
index ec3634966a07..000000000000
--- a/dev-python/requests/files/requests-2.28.0-drop-dependency-warnings.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Minimal patch to avoid often rebasing.
-
-We already have tools to try check for these (`pip check` obviously, but also
-app-portage/gpyutils provides gpy-verify-deps).
---- a/requests/__init__.py
-+++ b/requests/__init__.py
-@@ -106,13 +106,7 @@ try:
- urllib3.__version__, chardet_version, charset_normalizer_version
- )
- except (AssertionError, ValueError):
-- warnings.warn(
-- "urllib3 ({}) or chardet ({})/charset_normalizer ({}) doesn't match a supported "
-- "version!".format(
-- urllib3.__version__, chardet_version, charset_normalizer_version
-- ),
-- RequestsDependencyWarning,
-- )
-+ pass
-
- # Attempt to enable urllib3's fallback for SNI support
- # if the standard library doesn't support SNI or the
diff --git a/dev-python/requests/requests-2.31.0.ebuild b/dev-python/requests/requests-2.31.0.ebuild
deleted file mode 100644
index 957677723e0d..000000000000
--- a/dev-python/requests/requests-2.31.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="
- https://requests.readthedocs.io/
- https://github.com/psf/requests/
- https://pypi.org/project/requests/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="socks5 test-rust"
-
-RDEPEND="
- >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
- <dev-python/charset-normalizer-4[${PYTHON_USEDEP}]
- <dev-python/idna-4[${PYTHON_USEDEP}]
- <dev-python/urllib3-3[${PYTHON_USEDEP}]
- socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-"
-
-BDEPEND="
- test? (
- >=dev-python/pytest-httpbin-2.0.0[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
- test-rust? (
- dev-python/trustme[${PYTHON_USEDEP}]
- )
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.28.0-drop-dependency-warnings.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
- local EPYTEST_DESELECT=(
- # Internet (doctests)
- requests/__init__.py::requests
- requests/api.py::requests.api.request
- requests/models.py::requests.models.PreparedRequest
- requests/sessions.py::requests.sessions.Session
- # require IPv4 interface in 10.* range
- tests/test_requests.py::TestTimeout::test_connect_timeout
- tests/test_requests.py::TestTimeout::test_total_timeout_connect
- # TODO: openssl?
- tests/test_requests.py::TestRequests::test_pyopenssl_redirect
- # flask-2
- tests/test_requests.py::TestRequests::test_cookie_sent_on_redirect
- tests/test_requests.py::TestRequests::test_cookie_removed_on_expire
- tests/test_requests.py::TestPreparingURLs::test_redirecting_to_bad_url
- )
-
- case ${EPYTHON} in
- python3.13)
- ;&
- python3.12)
- EPYTEST_DESELECT+=(
- # different repr()
- requests/utils.py::requests.utils.from_key_val_list
- )
- ;;
- esac
-
- if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
- EPYTEST_DESELECT+=(
- tests/test_requests.py::TestRequests::test_https_warnings
- )
- fi
-
- epytest
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/, dev-python/requests/files/
@ 2023-02-16 20:28 Michał Górny
0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2023-02-16 20:28 UTC (permalink / raw
To: gentoo-commits
commit: 3a60709bc29042e80c7c51af393cc01bbb6ef542
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 20:27:02 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 20:27:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a60709b
dev-python/requests: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/requests/Manifest | 1 -
...uests-2.28.1-fix-charsetnormalizer-assert.patch | 41 ------------
dev-python/requests/requests-2.28.1-r1.ebuild | 74 ----------------------
3 files changed, 116 deletions(-)
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 8c19f20cc4ad..8b5848be0464 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,2 +1 @@
-DIST requests-2.28.1.tar.gz 109805 BLAKE2B 2106be5f9e1d9f1a22de5522b5d72084f91c2849e60e33b89b2411b76cae9b1f7faac34947f69c49480d001e9b77e4dce723ee939d51591882854d510db49b59 SHA512 c123ec07171c2c7c34e4173b97750adfa313b4312d91c0d58e4eb8750361604017e5b370c23ec886d2cbf704f9074ec5ad0fa9c2cd8e6f9521532adafff39d41
DIST requests-2.28.2.tar.gz 108206 BLAKE2B fe6c5d78e6abd36b7134c6e424b5a1c4052eba62b55a01b5842f289b94df3af039a5beba71374db563dd52ce42471d5e3650763b9324533ea6ab3bfd8013379b SHA512 3c4ba19a2bb6ba38a4118cf246db3855401869d54ee7ebd9bee40b435420381fb737d4c69768f2bd97914a30d66233c7058cec51aa629af0dff3b04e6f997a3d
diff --git a/dev-python/requests/files/requests-2.28.1-fix-charsetnormalizer-assert.patch b/dev-python/requests/files/requests-2.28.1-fix-charsetnormalizer-assert.patch
deleted file mode 100644
index 9975072c0c06..000000000000
--- a/dev-python/requests/files/requests-2.28.1-fix-charsetnormalizer-assert.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 23977ed77a..b679181bda 100755
---- a/setup.py
-+++ b/setup.py
-@@ -59,7 +59,7 @@ def run_tests(self):
- sys.exit()
-
- requires = [
-- "charset_normalizer>=2,<3",
-+ "charset_normalizer>=2,<4",
- "idna>=2.5,<4",
- "urllib3>=1.21.1,<1.27",
- "certifi>=2017.4.17",
-diff --git a/setup.cfg b/setup.cfg
-index 33af66eb15..0c167eb8c9 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -5,7 +5,7 @@ provides-extra =
- use_chardet_on_py3
- requires-dist =
- certifi>=2017.4.17
-- charset_normalizer>=2,<3
-+ charset_normalizer>=2,<4
- idna>=2.5,<4
- urllib3>=1.21.1,<1.27
-
-diff --git a/requests/__init__.py b/requests/__init__.py
-index 7ac8e297b8..5812c85d8a 100644
---- a/requests/__init__.py
-+++ b/requests/__init__.py
-@@ -80,8 +80,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver
- elif charset_normalizer_version:
- major, minor, patch = charset_normalizer_version.split(".")[:3]
- major, minor, patch = int(major), int(minor), int(patch)
-- # charset_normalizer >= 2.0.0 < 3.0.0
-- assert (2, 0, 0) <= (major, minor, patch) < (3, 0, 0)
-+ # charset_normalizer >= 2.0.0 < 4.0.0
-+ assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0)
- else:
- raise Exception("You need either charset_normalizer or chardet installed")
-
diff --git a/dev-python/requests/requests-2.28.1-r1.ebuild b/dev-python/requests/requests-2.28.1-r1.ebuild
deleted file mode 100644
index acd943c80725..000000000000
--- a/dev-python/requests/requests-2.28.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="
- https://requests.readthedocs.io/
- https://github.com/psf/requests/
- https://pypi.org/project/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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="socks5 test-rust"
-
-RDEPEND="
- >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
- dev-python/charset_normalizer[${PYTHON_USEDEP}]
- <dev-python/idna-4[${PYTHON_USEDEP}]
- <dev-python/urllib3-1.27[${PYTHON_USEDEP}]
- socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-"
-
-BDEPEND="
- test? (
- dev-python/pytest-httpbin[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
- test-rust? (
- dev-python/trustme[${PYTHON_USEDEP}]
- )
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.28.0-drop-dependency-warnings.patch
- # https://github.com/psf/requests/pull/6261
- "${FILESDIR}"/${PN}-2.28.1-fix-charsetnormalizer-assert.patch
-)
-
-distutils_enable_tests pytest
-
-python_test() {
- local EPYTEST_DESELECT=(
- # Internet (doctests)
- requests/__init__.py::requests
- requests/api.py::requests.api.request
- requests/models.py::requests.models.PreparedRequest
- requests/sessions.py::requests.sessions.Session
- # require IPv4 interface in 10.* range
- tests/test_requests.py::TestTimeout::test_connect_timeout
- tests/test_requests.py::TestTimeout::test_total_timeout_connect
- # TODO: openssl?
- tests/test_requests.py::TestRequests::test_pyopenssl_redirect
- )
-
- if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
- EPYTEST_DESELECT+=(
- tests/test_requests.py::TestRequests::test_https_warnings
- )
- fi
-
- epytest
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/, dev-python/requests/files/
@ 2022-10-23 5:39 Michał Górny
0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2022-10-23 5:39 UTC (permalink / raw
To: gentoo-commits
commit: cc8cc1b084289bdc831bef60706d187c77b92881
Author: Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Sun Oct 23 04:52:38 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 05:07:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc8cc1b0
dev-python/requests: allow charset normalizer >=2 and <4
charset-normalizer 3.0.0 has been released in ::gentoo
Fix crashed problem when installed charset_normalizer-3.0.0
Closes: https://bugs.gentoo.org/878035
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27909
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
...uests-2.28.1-fix-charsetnormalizer-assert.patch | 41 ++++++++++++++++++++++
...sts-2.28.1.ebuild => requests-2.28.1-r1.ebuild} | 2 ++
2 files changed, 43 insertions(+)
diff --git a/dev-python/requests/files/requests-2.28.1-fix-charsetnormalizer-assert.patch b/dev-python/requests/files/requests-2.28.1-fix-charsetnormalizer-assert.patch
new file mode 100644
index 000000000000..9975072c0c06
--- /dev/null
+++ b/dev-python/requests/files/requests-2.28.1-fix-charsetnormalizer-assert.patch
@@ -0,0 +1,41 @@
+diff --git a/setup.py b/setup.py
+index 23977ed77a..b679181bda 100755
+--- a/setup.py
++++ b/setup.py
+@@ -59,7 +59,7 @@ def run_tests(self):
+ sys.exit()
+
+ requires = [
+- "charset_normalizer>=2,<3",
++ "charset_normalizer>=2,<4",
+ "idna>=2.5,<4",
+ "urllib3>=1.21.1,<1.27",
+ "certifi>=2017.4.17",
+diff --git a/setup.cfg b/setup.cfg
+index 33af66eb15..0c167eb8c9 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -5,7 +5,7 @@ provides-extra =
+ use_chardet_on_py3
+ requires-dist =
+ certifi>=2017.4.17
+- charset_normalizer>=2,<3
++ charset_normalizer>=2,<4
+ idna>=2.5,<4
+ urllib3>=1.21.1,<1.27
+
+diff --git a/requests/__init__.py b/requests/__init__.py
+index 7ac8e297b8..5812c85d8a 100644
+--- a/requests/__init__.py
++++ b/requests/__init__.py
+@@ -80,8 +80,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver
+ elif charset_normalizer_version:
+ major, minor, patch = charset_normalizer_version.split(".")[:3]
+ major, minor, patch = int(major), int(minor), int(patch)
+- # charset_normalizer >= 2.0.0 < 3.0.0
+- assert (2, 0, 0) <= (major, minor, patch) < (3, 0, 0)
++ # charset_normalizer >= 2.0.0 < 4.0.0
++ assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0)
+ else:
+ raise Exception("You need either charset_normalizer or chardet installed")
+
diff --git a/dev-python/requests/requests-2.28.1.ebuild b/dev-python/requests/requests-2.28.1-r1.ebuild
similarity index 94%
rename from dev-python/requests/requests-2.28.1.ebuild
rename to dev-python/requests/requests-2.28.1-r1.ebuild
index 2a817e73057f..b317fdb9e931 100644
--- a/dev-python/requests/requests-2.28.1.ebuild
+++ b/dev-python/requests/requests-2.28.1-r1.ebuild
@@ -44,6 +44,8 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-2.28.0-drop-dependency-warnings.patch
+ # https://github.com/psf/requests/pull/6261
+ "${FILESDIR}"/${PN}-2.28.1-fix-charsetnormalizer-assert.patch
)
distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/, dev-python/requests/files/
@ 2022-06-26 6:47 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-06-26 6:47 UTC (permalink / raw
To: gentoo-commits
commit: 3d1e085725f9968e622a29d985c5e18c1ab25efc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 06:47:23 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 06:47:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d1e0857
dev-python/requests: unpin chardet
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../requests-2.28.0-drop-dependency-warnings.patch | 21 ++++++
.../files/requests-2.28.0-unpin-chardet.patch | 37 +++++++++++
dev-python/requests/requests-2.28.0-r2.ebuild | 74 ++++++++++++++++++++++
3 files changed, 132 insertions(+)
diff --git a/dev-python/requests/files/requests-2.28.0-drop-dependency-warnings.patch b/dev-python/requests/files/requests-2.28.0-drop-dependency-warnings.patch
new file mode 100644
index 000000000000..ec3634966a07
--- /dev/null
+++ b/dev-python/requests/files/requests-2.28.0-drop-dependency-warnings.patch
@@ -0,0 +1,21 @@
+Minimal patch to avoid often rebasing.
+
+We already have tools to try check for these (`pip check` obviously, but also
+app-portage/gpyutils provides gpy-verify-deps).
+--- a/requests/__init__.py
++++ b/requests/__init__.py
+@@ -106,13 +106,7 @@ try:
+ urllib3.__version__, chardet_version, charset_normalizer_version
+ )
+ except (AssertionError, ValueError):
+- warnings.warn(
+- "urllib3 ({}) or chardet ({})/charset_normalizer ({}) doesn't match a supported "
+- "version!".format(
+- urllib3.__version__, chardet_version, charset_normalizer_version
+- ),
+- RequestsDependencyWarning,
+- )
++ pass
+
+ # Attempt to enable urllib3's fallback for SNI support
+ # if the standard library doesn't support SNI or the
diff --git a/dev-python/requests/files/requests-2.28.0-unpin-chardet.patch b/dev-python/requests/files/requests-2.28.0-unpin-chardet.patch
new file mode 100644
index 000000000000..bd0451daaf13
--- /dev/null
+++ b/dev-python/requests/files/requests-2.28.0-unpin-chardet.patch
@@ -0,0 +1,37 @@
+https://github.com/psf/requests/pull/6179
+
+From 09483bae4f56e4f4c227e2d25ee920c538271feb Mon Sep 17 00:00:00 2001
+From: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
+Date: Sun, 26 Jun 2022 12:18:42 +0800
+Subject: [PATCH] Update Dependency with `chardet>=3.0.2,<6`
+
+https://github.com/chardet/chardet/releases/tag/5.0.0 was released on
+2022-06-25 with remove of Python 3.6 support, which also align with our
+Python > 3.6 requirement.
+
+Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
+--- a/requests/__init__.py
++++ b/requests/__init__.py
+@@ -75,8 +75,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver
+ if chardet_version:
+ major, minor, patch = chardet_version.split(".")[:3]
+ major, minor, patch = int(major), int(minor), int(patch)
+- # chardet_version >= 3.0.2, < 5.0.0
+- assert (3, 0, 2) <= (major, minor, patch) < (5, 0, 0)
++ # chardet_version >= 3.0.2, < 6.0.0
++ assert (3, 0, 2) <= (major, minor, patch) < (6, 0, 0)
+ elif charset_normalizer_version:
+ major, minor, patch = charset_normalizer_version.split(".")[:3]
+ major, minor, patch = int(major), int(minor), int(patch)
+--- a/setup.py
++++ b/setup.py
+@@ -123,7 +123,7 @@ def run_tests(self):
+ extras_require={
+ "security": [],
+ "socks": ["PySocks>=1.5.6, !=1.5.7"],
+- "use_chardet_on_py3": ["chardet>=3.0.2,<5"],
++ "use_chardet_on_py3": ["chardet>=3.0.2,<6"],
+ },
+ project_urls={
+ "Documentation": "https://requests.readthedocs.io",
+
diff --git a/dev-python/requests/requests-2.28.0-r2.ebuild b/dev-python/requests/requests-2.28.0-r2.ebuild
new file mode 100644
index 000000000000..c3c23c38db26
--- /dev/null
+++ b/dev-python/requests/requests-2.28.0-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="
+ https://requests.readthedocs.io/
+ https://github.com/psf/requests/
+ https://pypi.org/project/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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="socks5"
+
+RDEPEND="
+ >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+ dev-python/charset_normalizer[${PYTHON_USEDEP}]
+ <dev-python/idna-4[${PYTHON_USEDEP}]
+ <dev-python/urllib3-1.27[${PYTHON_USEDEP}]
+ socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+"
+
+BDEPEND="
+ test? (
+ dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+ !alpha? ( !hppa? ( !ia64? (
+ dev-python/trustme[${PYTHON_USEDEP}]
+ ) ) )
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.28.0-unpin-charset-normalizer.patch
+ "${FILESDIR}"/${PN}-2.28.0-unpin-chardet.patch
+ "${FILESDIR}"/${PN}-2.28.0-drop-dependency-warnings.patch
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # Internet (doctests)
+ requests/__init__.py::requests
+ requests/api.py::requests.api.request
+ requests/models.py::requests.models.PreparedRequest
+ requests/sessions.py::requests.sessions.Session
+ # require IPv4 interface in 10.* range
+ tests/test_requests.py::TestTimeout::test_connect_timeout
+ tests/test_requests.py::TestTimeout::test_total_timeout_connect
+ # TODO: openssl?
+ tests/test_requests.py::TestRequests::test_pyopenssl_redirect
+ )
+
+ if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
+ EPYTEST_DESELECT+=(
+ tests/test_requests.py::TestRequests::test_https_warnings
+ )
+ fi
+
+ epytest
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/, dev-python/requests/files/
@ 2022-06-21 22:58 Sam James
0 siblings, 0 replies; 13+ messages in thread
From: Sam James @ 2022-06-21 22:58 UTC (permalink / raw
To: gentoo-commits
commit: 2a75273025f7eb6434e1c847471f4a13a9f8345b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 22:57:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 22:57:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a752730
dev-python/requests: fix pinned charset_normalize dep
Bug: https://bugs.gentoo.org/853247
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../requests-2.28.0-unpin-charset-normalizer.patch | 33 ++++++++++++++++++++++
...sts-2.28.0.ebuild => requests-2.28.0-r1.ebuild} | 4 +++
2 files changed, 37 insertions(+)
diff --git a/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch b/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch
new file mode 100644
index 000000000000..b9f3a04aa02e
--- /dev/null
+++ b/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch
@@ -0,0 +1,33 @@
+https://github.com/psf/requests/pull/6169
+https://bugs.gentoo.org/853247
+
+From 9e9cd2a257392988e6fa417361c3085e5b85af85 Mon Sep 17 00:00:00 2001
+From: Lumir Balhar <lbalhar@redhat.com>
+Date: Mon, 20 Jun 2022 09:32:16 +0200
+Subject: [PATCH] Allow charset normalizer >=2 and <3
+
+--- a/setup.py
++++ b/setup.py
+@@ -59,7 +59,7 @@ def run_tests(self):
+ sys.exit()
+
+ requires = [
+- "charset_normalizer~=2.0.0",
++ "charset_normalizer~=2.0",
+ "idna>=2.5,<4",
+ "urllib3>=1.21.1,<1.27",
+ "certifi>=2017.4.17",
+
+diff --git a/setup.cfg b/setup.cfg
+index 751c171..99166ef 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -5,7 +5,7 @@ provides-extra =
+ use_chardet_on_py3
+ requires-dist =
+ certifi>=2017.4.17
+- charset_normalizer~=2.0.0
++ charset_normalizer~=2.0
+ idna>=2.5,<4
+ urllib3>=1.21.1,<1.27
+
diff --git a/dev-python/requests/requests-2.28.0.ebuild b/dev-python/requests/requests-2.28.0-r1.ebuild
similarity index 96%
rename from dev-python/requests/requests-2.28.0.ebuild
rename to dev-python/requests/requests-2.28.0-r1.ebuild
index 4d6d1335f33e..b96762bee446 100644
--- a/dev-python/requests/requests-2.28.0.ebuild
+++ b/dev-python/requests/requests-2.28.0-r1.ebuild
@@ -42,6 +42,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.28.0-unpin-charset-normalizer.patch
+)
+
distutils_enable_tests pytest
python_test() {
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/, dev-python/requests/files/
@ 2021-07-28 9:08 Michał Górny
0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2021-07-28 9:08 UTC (permalink / raw
To: gentoo-commits
commit: c8005f10a737943a4e7a7d06ffd78fb71b2d09b4
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 28 08:56:04 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 28 09:07:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8005f10
dev-python/requests: Fix test failures due to listen(0)
Fix test failures on platforms (alpha, riscv) that literally interpret
listen(0) as 'zero connections allowed'.
Closes: https://bugs.gentoo.org/803515
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../requests/files/requests-2.26.0-test.patch | 30 ++++++++++++++++++++++
dev-python/requests/requests-2.26.0.ebuild | 4 +++
2 files changed, 34 insertions(+)
diff --git a/dev-python/requests/files/requests-2.26.0-test.patch b/dev-python/requests/files/requests-2.26.0-test.patch
new file mode 100644
index 00000000000..6bbf7887171
--- /dev/null
+++ b/dev-python/requests/files/requests-2.26.0-test.patch
@@ -0,0 +1,30 @@
+From 6552e5374c335d62ba960a74b5b978897c823376 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 28 Jul 2021 10:33:22 +0200
+Subject: [PATCH] Fix creating non-listening sockets in tests on some platforms
+
+Fix the listen() invocation for the test server not to pass a backlog
+value of zero. The value of zero means no backlog which effectively
+means that the socket can not accept any connections. This does not
+matter for the majority of platforms since the value is only advisory
+and the platform tends to go with a bigger backlog anyway. However,
+a few platforms (e.g. alpha or riscv Linux) do take the value literally,
+and therefore the tests fail since they are unable to connect to
+the server. Let Python use a 'default reasonable value' instead.
+---
+ tests/testserver/server.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/testserver/server.py b/tests/testserver/server.py
+index 132221f7c4..92dcb6cb1a 100644
+--- a/tests/testserver/server.py
++++ b/tests/testserver/server.py
+@@ -78,7 +78,7 @@ def run(self):
+ def _create_socket_and_bind(self):
+ sock = socket.socket()
+ sock.bind((self.host, self.port))
+- sock.listen(0)
++ sock.listen()
+ return sock
+
+ def _close_server_sock_ignore_errors(self):
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index 24926975d01..d7001ec67df 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -36,6 +36,10 @@ BDEPEND="
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/${P}-test.patch
+)
+
python_test() {
local deselect=(
# Internet
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/, dev-python/requests/files/
@ 2019-01-27 17:16 Virgil Dupras
0 siblings, 0 replies; 13+ messages in thread
From: Virgil Dupras @ 2019-01-27 17:16 UTC (permalink / raw
To: gentoo-commits
commit: a5512269b8530127e1a156481b6a400f5083b209
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 17:15:34 2019 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 17:16:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5512269
dev-python/requests: remove old
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-python/requests/Manifest | 5 --
.../files/requests-2.12.1-system-packages.patch | 17 -------
.../files/requests-2.14.2-system-packages.patch | 19 --------
.../files/requests-2.5.0-system-cacerts.patch | 24 ----------
.../files/requests-2.9.1-system-packages.patch | 20 --------
dev-python/requests/requests-2.11.1.ebuild | 54 ---------------------
dev-python/requests/requests-2.12.5.ebuild | 55 ----------------------
dev-python/requests/requests-2.14.2.ebuild | 54 ---------------------
dev-python/requests/requests-2.18.2-r2.ebuild | 47 ------------------
dev-python/requests/requests-2.19.1-r1.ebuild | 52 --------------------
10 files changed, 347 deletions(-)
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 96e5ad527dd..bfd440a8fc6 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,7 +1,2 @@
-DIST requests-2.11.1.tar.gz 485936 BLAKE2B a6396da4beca66a0b546b92cebebb33352dc0855f50bba046bd40d7c65e71cdaab0b36496060dd4ee9c88b851f1f6e0faa4a2be5a596b475a08bd5359da43a0d SHA512 135cbab1e279ebf314bffca01bc4d9f9e71963c67069e330e78fbe06c4294031d1d616bc5d5e104161c8696b408887053bdd65351f85e9ff34646368c88852e5
-DIST requests-2.12.5.tar.gz 548336 BLAKE2B edb163b945289fe6d75365da523505d25eab47c5686f5e44a3eacd2a70adf1a45320e0bc8d5b91f10fae065117435682523117b4d338179c2a01352910be1d14 SHA512 3ad60b953c6db98d26c043c7e77c3be8b28389ee1dbf32e75663cf48a8ddc2e487df27c54c64736ff42b79e35a6dbd2788065469a61a520a9818183970274cd9
-DIST requests-2.14.2.tar.gz 521027 BLAKE2B c8f691b126876e069556542dbfc86a6aa645233b3539ca7fc0e02f42dec22bdcbb78863e3a9cf30a976af89cd8c1403c3c379737a5e1b07c54f19b217dbec529 SHA512 f6531ada6d854a261cad874044daa9e7f79d55c8f8fcfec1b25862563127318fbf717ed640644ddf0dbe4d7fe1298d478fcd76825a3604e06cefae5990fa9dd4
-DIST requests-2.18.2.tar.gz 125381 BLAKE2B f55bee7558424662ff5d577eefc89cdbdec3a209667bd174a3ec73554bab20582867139ce69ed5b996ecfb297cc251d41294188e21bd24d2241a0ad0432582f2 SHA512 b78660e5370f9acc458159edda385fbcbbb33b0703fa2c83400f3c08fe05253f357175e2ad76c5bff4bd942ab18da5df344473e9b5a924d7457596c0ff9bfbc6
DIST requests-2.18.4.tar.gz 126224 BLAKE2B 98ab1fe39832673ea7900029da275e031fc85811d6ddb0f37609ec50b18e17d8a04b6cef397bc626ba13da32e16ffa961626879106941d327694d8763dc1efb6 SHA512 5c59bed82ac1094194f04a973b299f7d783264d372abd7a5229295bccc6b2f7a9f082ee4b0dff348e9c22cf68ddbd7cb67f60fd0b7d9eda41c02e40d075e9472
-DIST requests-2.19.1.tar.gz 131068 BLAKE2B 54ffdfd7b2c6f504071c8b55d9672dcffafd31de90cb85d354bc17d7fa19807927b46977b22a407654cdb48d7293e1b0222771d4369e148e4d6410719ba820e3 SHA512 deef2662227497b472f6e7eb7f0ee468c772069fc66552f71d80e5a12af62a187f8bc6a8a78531915e824c7f277d0db61c1534c89d13d473f68504f0bd6edf47
DIST requests-2.21.0.tar.gz 111528 BLAKE2B 7b40f9f572a8efde41c177fb5d1e1eaf29ca60cad0661fa28ac0085f3700348380d619f68c0082f24044d1af82b16d6b1e7d5dd2c2a2329f85fcee7141b1fbf6 SHA512 385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104
diff --git a/dev-python/requests/files/requests-2.12.1-system-packages.patch b/dev-python/requests/files/requests-2.12.1-system-packages.patch
deleted file mode 100644
index 62fecf9cc7a..00000000000
--- a/dev-python/requests/files/requests-2.12.1-system-packages.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- requests-2.12.1/setup.py
-+++ requests-2.12.1/setup.py
-@@ -36,14 +36,6 @@
- packages = [
- 'requests',
- 'requests.packages',
-- 'requests.packages.chardet',
-- 'requests.packages.idna',
-- 'requests.packages.urllib3',
-- 'requests.packages.urllib3.packages',
-- 'requests.packages.urllib3.contrib',
-- 'requests.packages.urllib3.util',
-- 'requests.packages.urllib3.packages.ssl_match_hostname',
-- 'requests.packages.urllib3.packages.backports',
- ]
-
- requires = []
diff --git a/dev-python/requests/files/requests-2.14.2-system-packages.patch b/dev-python/requests/files/requests-2.14.2-system-packages.patch
deleted file mode 100644
index 67627d150fe..00000000000
--- a/dev-python/requests/files/requests-2.14.2-system-packages.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- requests-2.14.2/setup.py.old 2017-05-15 17:38:45.942532911 +0200
-+++ requests-2.14.2/setup.py 2017-05-15 17:39:03.629533611 +0200
-@@ -36,16 +36,6 @@
- packages = [
- 'requests',
- 'requests.packages',
-- 'requests.packages.chardet',
-- 'requests.packages.chardet.cli',
-- 'requests.packages.idna',
-- 'requests.packages.urllib3',
-- 'requests.packages.urllib3.packages',
-- 'requests.packages.urllib3.contrib',
-- 'requests.packages.urllib3.util',
-- 'requests.packages.urllib3.packages.ssl_match_hostname',
-- 'requests.packages.urllib3.packages.backports',
-- 'requests.packages.urllib3.contrib._securetransport',
- ]
-
- requires = []
diff --git a/dev-python/requests/files/requests-2.5.0-system-cacerts.patch b/dev-python/requests/files/requests-2.5.0-system-cacerts.patch
deleted file mode 100644
index f0d9e943e90..00000000000
--- a/dev-python/requests/files/requests-2.5.0-system-cacerts.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- requests-2.5.0/requests/certs.py
-+++ requests-2.5.0/requests/certs.py
-@@ -13,13 +13,14 @@
- """
- import os.path
-
--try:
-- from certifi import where
--except ImportError:
-- def where():
-- """Return the preferred certificate bundle."""
-- # vendored bundle inside Requests
-- return os.path.join(os.path.dirname(__file__), 'cacert.pem')
-+def where():
-+ """Return the preferred certificate bundle."""
-+ cacerts = '/etc/ssl/certs/ca-certificates.crt'
-+ if os.path.exists(cacerts):
-+ return cacerts
-+
-+ # vendored bundle inside Requests
-+ return os.path.join(os.path.dirname(__file__), 'cacert.pem')
-
- if __name__ == '__main__':
- print(where())
diff --git a/dev-python/requests/files/requests-2.9.1-system-packages.patch b/dev-python/requests/files/requests-2.9.1-system-packages.patch
deleted file mode 100644
index f511d0d6524..00000000000
--- a/dev-python/requests/files/requests-2.9.1-system-packages.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- setup.py | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index b7ed12b..1d5abe4 100755
---- a/setup.py
-+++ b/setup.py
-@@ -18,12 +18,6 @@ if sys.argv[-1] == 'publish':
- packages = [
- 'requests',
- 'requests.packages',
-- 'requests.packages.chardet',
-- 'requests.packages.urllib3',
-- 'requests.packages.urllib3.packages',
-- 'requests.packages.urllib3.contrib',
-- 'requests.packages.urllib3.util',
-- 'requests.packages.urllib3.packages.ssl_match_hostname',
- ]
-
- requires = []
diff --git a/dev-python/requests/requests-2.11.1.ebuild b/dev-python/requests/requests-2.11.1.ebuild
deleted file mode 100644
index d4d0a9ff54b..00000000000
--- a/dev-python/requests/requests-2.11.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ https://pypi.org/project/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.14[${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}"/${PN}-2.9.1-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.12.5.ebuild b/dev-python/requests/requests-2.12.5.ebuild
deleted file mode 100644
index c528fbc166d..00000000000
--- a/dev-python/requests/requests-2.12.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ https://pypi.org/project/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/cryptography-1.3.4[${PYTHON_USEDEP}]
- >=dev-python/idna-2.0[${PYTHON_USEDEP}]
- dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
- >=dev-python/py-1.4.30[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
- >=dev-python/urllib3-1.14[${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}"/${PN}-2.12.1-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.14.2.ebuild b/dev-python/requests/requests-2.14.2.ebuild
deleted file mode 100644
index f344c8e9fa8..00000000000
--- a/dev-python/requests/requests-2.14.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ https://pypi.org/project/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 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="
- app-misc/ca-certificates
- >=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
- >=dev-python/idna-2.5[${PYTHON_USEDEP}]
- dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
- >=dev-python/urllib3-1.21.1[${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.18.2-r2.ebuild b/dev-python/requests/requests-2.18.2-r2.ebuild
deleted file mode 100644
index f445f7e031f..00000000000
--- a/dev-python/requests/requests-2.18.2-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/"
-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 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="socks5 +ssl test"
-
-RDEPEND="
- >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
- >=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/idna-2.5[${PYTHON_USEDEP}]
- <dev-python/idna-2.6[${PYTHON_USEDEP}]
- <dev-python/urllib3-1.23[${PYTHON_USEDEP}]
- socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
- ssl? (
- >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
- )
-"
-
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-# tests connect to various remote sites
-RESTRICT="test"
-# test? (
-# dev-python/pytest[${PYTHON_USEDEP}]
-# dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-# dev-python/pytest-mock[${PYTHON_USEDEP}]
-# dev-python/pytest-xdist[${PYTHON_USEDEP}]
-# )
-
-python_test() {
- py.test -v --boxed || die
-}
diff --git a/dev-python/requests/requests-2.19.1-r1.ebuild b/dev-python/requests/requests-2.19.1-r1.ebuild
deleted file mode 100644
index 0d6c239ab99..00000000000
--- a/dev-python/requests/requests-2.19.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/"
-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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="socks5 +ssl"
-
-RDEPEND="
- >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
- >=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/idna-2.5[${PYTHON_USEDEP}]
- <dev-python/idna-2.8[${PYTHON_USEDEP}]
- <dev-python/urllib3-1.24[${PYTHON_USEDEP}]
- socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
- ssl? (
- >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
- )
-"
-
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-# tests connect to various remote sites
-RESTRICT="test"
-
-#DEPEND+="
-# test? (
-# dev-python/pytest[${PYTHON_USEDEP}]
-# dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-# dev-python/pytest-mock[${PYTHON_USEDEP}]
-# dev-python/pytest-xdist[${PYTHON_USEDEP}]
-# >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-# )
-#"
-
-python_test() {
- py.test || die
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/, dev-python/requests/files/
@ 2018-01-06 14:13 Michał Górny
0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2018-01-06 14:13 UTC (permalink / raw
To: gentoo-commits
commit: f03a990d45918977b6069a6dba48da87a94bff91
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 6 13:48:20 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 6 14:13:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f03a990d
dev-python/requests: Clean old up
dev-python/requests/Manifest | 3 --
.../files/requests-2.2.0-system-chardet.patch | 21 ---------
dev-python/requests/requests-2.13.0.ebuild | 54 ----------------------
dev-python/requests/requests-2.18.1.ebuild | 46 ------------------
dev-python/requests/requests-2.8.1.ebuild | 53 ---------------------
5 files changed, 177 deletions(-)
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 088c39b8942..f1367cf8fe9 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,8 +1,5 @@
DIST requests-2.11.1.tar.gz 485936 BLAKE2B a6396da4beca66a0b546b92cebebb33352dc0855f50bba046bd40d7c65e71cdaab0b36496060dd4ee9c88b851f1f6e0faa4a2be5a596b475a08bd5359da43a0d SHA512 135cbab1e279ebf314bffca01bc4d9f9e71963c67069e330e78fbe06c4294031d1d616bc5d5e104161c8696b408887053bdd65351f85e9ff34646368c88852e5
DIST requests-2.12.5.tar.gz 548336 BLAKE2B edb163b945289fe6d75365da523505d25eab47c5686f5e44a3eacd2a70adf1a45320e0bc8d5b91f10fae065117435682523117b4d338179c2a01352910be1d14 SHA512 3ad60b953c6db98d26c043c7e77c3be8b28389ee1dbf32e75663cf48a8ddc2e487df27c54c64736ff42b79e35a6dbd2788065469a61a520a9818183970274cd9
-DIST requests-2.13.0.tar.gz 557508 BLAKE2B f7ef3349eb090dfd9dabbf81410b801ce97a74a1a22f8b935ccf980218e49ead054ca78f97dde4fe48fee40c2b6e92a62364a386d79787c3c8847ee2805e6330 SHA512 d3e9c25d1ce7ecf51bd4b137645d06c07170542a78fc847b1c30cad6efa9bcbf36d4b0c809389cbf260dc7d73128ab6bbed1e197cba9497b6ad791b48014ae14
DIST requests-2.14.2.tar.gz 521027 BLAKE2B c8f691b126876e069556542dbfc86a6aa645233b3539ca7fc0e02f42dec22bdcbb78863e3a9cf30a976af89cd8c1403c3c379737a5e1b07c54f19b217dbec529 SHA512 f6531ada6d854a261cad874044daa9e7f79d55c8f8fcfec1b25862563127318fbf717ed640644ddf0dbe4d7fe1298d478fcd76825a3604e06cefae5990fa9dd4
-DIST requests-2.18.1.tar.gz 124229 BLAKE2B 71b73af2afa87b1cfaedb9c27f2c305b0a9dce536a716a15441ef9d098c50c50a8f826ee540a4bac053e4f1cbc0af0cd8b87924368755aea02fac131d215e017 SHA512 d7482ddce36ce633bee830bc8d9f9a207e1c20595378f7c60dcef01cab016a16704965f3b52e3faac63dd50fbe7c61d575742e71f51a2b8d41c1922df2dbaa06
DIST requests-2.18.2.tar.gz 125381 BLAKE2B f55bee7558424662ff5d577eefc89cdbdec3a209667bd174a3ec73554bab20582867139ce69ed5b996ecfb297cc251d41294188e21bd24d2241a0ad0432582f2 SHA512 b78660e5370f9acc458159edda385fbcbbb33b0703fa2c83400f3c08fe05253f357175e2ad76c5bff4bd942ab18da5df344473e9b5a924d7457596c0ff9bfbc6
DIST requests-2.18.4.tar.gz 126224 BLAKE2B 98ab1fe39832673ea7900029da275e031fc85811d6ddb0f37609ec50b18e17d8a04b6cef397bc626ba13da32e16ffa961626879106941d327694d8763dc1efb6 SHA512 5c59bed82ac1094194f04a973b299f7d783264d372abd7a5229295bccc6b2f7a9f082ee4b0dff348e9c22cf68ddbd7cb67f60fd0b7d9eda41c02e40d075e9472
-DIST requests-2.8.1.tar.gz 480803 BLAKE2B 8af2cd1588f2dec11f04286132eda8c2bac956ea45d5a6ae32baf09d87dd1c4749d936aa607dc554a568bbc04e3485463d7f60ca62d77a9c2eca5db0a11c22f8 SHA512 bccec89165596df3af3f46eb43b5b28b595752485b00ed73978ef76fa6b8a8961c3db046c3f91ff34fa390f037322f6e13b141ba9b600a836a6d798086bd13fb
diff --git a/dev-python/requests/files/requests-2.2.0-system-chardet.patch b/dev-python/requests/files/requests-2.2.0-system-chardet.patch
deleted file mode 100644
index 18fc7a992bf..00000000000
--- a/dev-python/requests/files/requests-2.2.0-system-chardet.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- requests-2.2.0/requests/compat.py
-+++ requests-2.2.0/requests/compat.py
-@@ -4,7 +4,7 @@
- pythoncompat
- """
-
--from .packages import chardet
-+import chardet
-
- import sys
-
---- requests-2.2.0/setup.py
-+++ requests-2.2.0/setup.py
-@@ -17,7 +17,6 @@
- packages = [
- 'requests',
- 'requests.packages',
-- 'requests.packages.chardet',
- 'requests.packages.urllib3',
- 'requests.packages.urllib3.packages',
- 'requests.packages.urllib3.contrib',
diff --git a/dev-python/requests/requests-2.13.0.ebuild b/dev-python/requests/requests-2.13.0.ebuild
deleted file mode 100644
index ca733c4061c..00000000000
--- a/dev-python/requests/requests-2.13.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-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 ~x64-cygwin ~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/cryptography-1.3.4[${PYTHON_USEDEP}]
- >=dev-python/idna-2.0[${PYTHON_USEDEP}]
- dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
- >=dev-python/urllib3-1.20[${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}"/${PN}-2.12.1-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.18.1.ebuild b/dev-python/requests/requests-2.18.1.ebuild
deleted file mode 100644
index bbf594bc0e5..00000000000
--- a/dev-python/requests/requests-2.18.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/"
-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 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="socks5 +ssl test"
-
-RDEPEND="
- >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
- >=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/idna-2.5[${PYTHON_USEDEP}]
- >=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
- socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
- ssl? (
- >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
- )
-"
-
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-# tests connect to various remote sites
-RESTRICT="test"
-# test? (
-# dev-python/pytest[${PYTHON_USEDEP}]
-# dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-# dev-python/pytest-mock[${PYTHON_USEDEP}]
-# dev-python/pytest-xdist[${PYTHON_USEDEP}]
-# )
-
-python_test() {
- py.test -v --boxed || die
-}
diff --git a/dev-python/requests/requests-2.8.1.ebuild b/dev-python/requests/requests-2.8.1.ebuild
deleted file mode 100644
index 30e3700e685..00000000000
--- a/dev-python/requests/requests-2.8.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-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"
-
-# bundles dev-python/urllib3 snapshot
-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[$(python_gen_usedep 'python*' pypy)]
- "
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- >=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
- )
- "
-
-# tests connect to various remote sites
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2.0-system-chardet.patch
- "${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
-)
-
-python_prepare_all() {
- # use system chardet
- rm -r requests/packages/chardet || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- "${PYTHON}" test_requests.py || die "Tests fail with ${EPYTHON}"
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/, dev-python/requests/files/
@ 2017-05-15 15:48 Manuel Rüger
0 siblings, 0 replies; 13+ messages in thread
From: Manuel Rüger @ 2017-05-15 15:48 UTC (permalink / raw
To: gentoo-commits
commit: e5b379c157be46fe33849e56f66ebc09dc463916
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon May 15 15:48:00 2017 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon May 15 15:48:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b379c1
dev-python/requests: Version bump to 2.14.2
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-python/requests/Manifest | 1 +
.../files/requests-2.14.2-system-packages.patch | 19 ++++++++
dev-python/requests/requests-2.14.2.ebuild | 54 ++++++++++++++++++++++
3 files changed, 74 insertions(+)
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 9b88031d028..507ef33c624 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,4 +1,5 @@
DIST requests-2.11.1.tar.gz 485936 SHA256 5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133 SHA512 135cbab1e279ebf314bffca01bc4d9f9e71963c67069e330e78fbe06c4294031d1d616bc5d5e104161c8696b408887053bdd65351f85e9ff34646368c88852e5 WHIRLPOOL 838e3074f56a87766ebeb04eb75fdd6f5c83da7448b5e9297be8143330acaeae540d10939b7118cbd9e86c1749c8db5c6c22d50064e704b9c1d7278a37a48af4
DIST requests-2.12.5.tar.gz 548336 SHA256 d902a54f08d086a7cc6e58c20e2bb225b1ae82c19c35e5925269ee94fb9fce00 SHA512 3ad60b953c6db98d26c043c7e77c3be8b28389ee1dbf32e75663cf48a8ddc2e487df27c54c64736ff42b79e35a6dbd2788065469a61a520a9818183970274cd9 WHIRLPOOL bc347e966743a940c09ed9bc98fed7422648a9b0354d36aaf94820fb306169842fafe5d34a48effb46547bb44fb46b2499cb1ba7dfd3ec029426cf97418d9c68
DIST requests-2.13.0.tar.gz 557508 SHA256 5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8 SHA512 d3e9c25d1ce7ecf51bd4b137645d06c07170542a78fc847b1c30cad6efa9bcbf36d4b0c809389cbf260dc7d73128ab6bbed1e197cba9497b6ad791b48014ae14 WHIRLPOOL febfabea45aa45093eb04758f40a35b6479e16f833fd83abc798d2b5786bed025bb00c45e8dea9161aff735bde693573e6f5db7e5ee09ad3d2b140673e2cbcf8
+DIST requests-2.14.2.tar.gz 521027 SHA256 a274abba399a23e8713ffd2b5706535ae280ebe2b8069ee6a941cb089440d153 SHA512 f6531ada6d854a261cad874044daa9e7f79d55c8f8fcfec1b25862563127318fbf717ed640644ddf0dbe4d7fe1298d478fcd76825a3604e06cefae5990fa9dd4 WHIRLPOOL e242d8182312b437a27bdc1d4a099d7db0c6135b3de29c0285ba60f6a72e1102941603cc551d8f3a4597f479c7d9409eef073c25b2411df93d0903d9f87b316f
DIST requests-2.8.1.tar.gz 480803 SHA256 84fe8d5bf4dcdcc49002446c47a146d17ac10facf00d9086659064ac43b6c25b SHA512 bccec89165596df3af3f46eb43b5b28b595752485b00ed73978ef76fa6b8a8961c3db046c3f91ff34fa390f037322f6e13b141ba9b600a836a6d798086bd13fb WHIRLPOOL 445e0e12f5900c3396ae7a76d0010b9c4a4ff2c79c51dfc88f117918e436a4d67ea25de39f252cacaabd737b7b1542374172a2b6f482d7ffe1f7514d1cb4a06b
diff --git a/dev-python/requests/files/requests-2.14.2-system-packages.patch b/dev-python/requests/files/requests-2.14.2-system-packages.patch
new file mode 100644
index 00000000000..67627d150fe
--- /dev/null
+++ b/dev-python/requests/files/requests-2.14.2-system-packages.patch
@@ -0,0 +1,19 @@
+--- requests-2.14.2/setup.py.old 2017-05-15 17:38:45.942532911 +0200
++++ requests-2.14.2/setup.py 2017-05-15 17:39:03.629533611 +0200
+@@ -36,16 +36,6 @@
+ packages = [
+ 'requests',
+ 'requests.packages',
+- 'requests.packages.chardet',
+- 'requests.packages.chardet.cli',
+- 'requests.packages.idna',
+- 'requests.packages.urllib3',
+- 'requests.packages.urllib3.packages',
+- 'requests.packages.urllib3.contrib',
+- 'requests.packages.urllib3.util',
+- 'requests.packages.urllib3.packages.ssl_match_hostname',
+- 'requests.packages.urllib3.packages.backports',
+- 'requests.packages.urllib3.contrib._securetransport',
+ ]
+
+ requires = []
diff --git a/dev-python/requests/requests-2.14.2.ebuild b/dev-python/requests/requests-2.14.2.ebuild
new file mode 100644
index 00000000000..d96c3241576
--- /dev/null
+++ b/dev-python/requests/requests-2.14.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+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 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+ app-misc/ca-certificates
+ >=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+ >=dev-python/idna-2.5[${PYTHON_USEDEP}]
+ dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.14[$(python_gen_usedep 'python*' pypy)]
+ >=dev-python/urllib3-1.21.1[${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
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/, dev-python/requests/files/
@ 2017-05-03 11:48 Manuel Rüger
0 siblings, 0 replies; 13+ messages in thread
From: Manuel Rüger @ 2017-05-03 11:48 UTC (permalink / raw
To: gentoo-commits
commit: 267c1663ad8510a176d1735470050f7ac1948cd9
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Wed May 3 11:48:07 2017 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Wed May 3 11:48:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=267c1663
dev-python/requests: Readd 2.11.1 for docker-compose
Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --force
dev-python/requests/Manifest | 1 +
.../files/requests-2.9.1-system-packages.patch | 20 ++++++++
dev-python/requests/requests-2.11.1.ebuild | 54 ++++++++++++++++++++++
3 files changed, 75 insertions(+)
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index aa7b0437479..9b88031d028 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,3 +1,4 @@
+DIST requests-2.11.1.tar.gz 485936 SHA256 5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133 SHA512 135cbab1e279ebf314bffca01bc4d9f9e71963c67069e330e78fbe06c4294031d1d616bc5d5e104161c8696b408887053bdd65351f85e9ff34646368c88852e5 WHIRLPOOL 838e3074f56a87766ebeb04eb75fdd6f5c83da7448b5e9297be8143330acaeae540d10939b7118cbd9e86c1749c8db5c6c22d50064e704b9c1d7278a37a48af4
DIST requests-2.12.5.tar.gz 548336 SHA256 d902a54f08d086a7cc6e58c20e2bb225b1ae82c19c35e5925269ee94fb9fce00 SHA512 3ad60b953c6db98d26c043c7e77c3be8b28389ee1dbf32e75663cf48a8ddc2e487df27c54c64736ff42b79e35a6dbd2788065469a61a520a9818183970274cd9 WHIRLPOOL bc347e966743a940c09ed9bc98fed7422648a9b0354d36aaf94820fb306169842fafe5d34a48effb46547bb44fb46b2499cb1ba7dfd3ec029426cf97418d9c68
DIST requests-2.13.0.tar.gz 557508 SHA256 5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8 SHA512 d3e9c25d1ce7ecf51bd4b137645d06c07170542a78fc847b1c30cad6efa9bcbf36d4b0c809389cbf260dc7d73128ab6bbed1e197cba9497b6ad791b48014ae14 WHIRLPOOL febfabea45aa45093eb04758f40a35b6479e16f833fd83abc798d2b5786bed025bb00c45e8dea9161aff735bde693573e6f5db7e5ee09ad3d2b140673e2cbcf8
DIST requests-2.8.1.tar.gz 480803 SHA256 84fe8d5bf4dcdcc49002446c47a146d17ac10facf00d9086659064ac43b6c25b SHA512 bccec89165596df3af3f46eb43b5b28b595752485b00ed73978ef76fa6b8a8961c3db046c3f91ff34fa390f037322f6e13b141ba9b600a836a6d798086bd13fb WHIRLPOOL 445e0e12f5900c3396ae7a76d0010b9c4a4ff2c79c51dfc88f117918e436a4d67ea25de39f252cacaabd737b7b1542374172a2b6f482d7ffe1f7514d1cb4a06b
diff --git a/dev-python/requests/files/requests-2.9.1-system-packages.patch b/dev-python/requests/files/requests-2.9.1-system-packages.patch
new file mode 100644
index 00000000000..f511d0d6524
--- /dev/null
+++ b/dev-python/requests/files/requests-2.9.1-system-packages.patch
@@ -0,0 +1,20 @@
+ setup.py | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index b7ed12b..1d5abe4 100755
+--- a/setup.py
++++ b/setup.py
+@@ -18,12 +18,6 @@ if sys.argv[-1] == 'publish':
+ packages = [
+ 'requests',
+ 'requests.packages',
+- 'requests.packages.chardet',
+- 'requests.packages.urllib3',
+- 'requests.packages.urllib3.packages',
+- 'requests.packages.urllib3.contrib',
+- 'requests.packages.urllib3.util',
+- 'requests.packages.urllib3.packages.ssl_match_hostname',
+ ]
+
+ requires = []
diff --git a/dev-python/requests/requests-2.11.1.ebuild b/dev-python/requests/requests-2.11.1.ebuild
new file mode 100644
index 00000000000..4fadd2dee90
--- /dev/null
+++ b/dev-python/requests/requests-2.11.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+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.14[${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}"/${PN}-2.9.1-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
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/, dev-python/requests/files/
@ 2016-11-30 13:54 Lars Wendler
0 siblings, 0 replies; 13+ messages in thread
From: Lars Wendler @ 2016-11-30 13:54 UTC (permalink / raw
To: gentoo-commits
commit: 8050c1d7c9abb7f35c0e81b485440ec75e2912a4
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 12:35:48 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 13:54:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8050c1d7
dev-python/requests: Bump to version 2.12.1
Package-Manager: portage-2.3.2
dev-python/requests/Manifest | 1 +
.../files/requests-2.12.1-system-packages.patch | 17 +++++++
dev-python/requests/requests-2.12.1.ebuild | 56 ++++++++++++++++++++++
3 files changed, 74 insertions(+)
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 030c045..80b38ad 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,4 +1,5 @@
DIST requests-2.11.1.tar.gz 485936 SHA256 5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133 SHA512 135cbab1e279ebf314bffca01bc4d9f9e71963c67069e330e78fbe06c4294031d1d616bc5d5e104161c8696b408887053bdd65351f85e9ff34646368c88852e5 WHIRLPOOL 838e3074f56a87766ebeb04eb75fdd6f5c83da7448b5e9297be8143330acaeae540d10939b7118cbd9e86c1749c8db5c6c22d50064e704b9c1d7278a37a48af4
+DIST requests-2.12.1.tar.gz 545246 SHA256 2109ecea94df90980be040490ff1d879971b024861539abb00054062388b612e SHA512 e4da2ef674bcddd96bad91b0b06d4736270a348b740e7006537bc1c27704e1fe2592e1c8b0440c8e1c9a765eefcaf254952bfe5f2871c4ae4bd17962b33fcb00 WHIRLPOOL 6ab1c7e94069ba0ed9509d5706a5498a393e0fcdb5baca9dc1c05a40623c044afc927339ea407b067e563e99556402aae4938a6e382a55e639fa4ca77e1498e4
DIST requests-2.7.0.tar.gz 451723 SHA256 398a3db6d61899d25fd4a06c6ca12051b0ce171d705decd7ed5511517b4bb93d SHA512 a93223c3fd21c58f7c0c901b17be17c23dba4efeed8c4347da9d4e04d96a6698e08e01482205661cb7757cc7560d9ae2e62b18f2b422af0cb90fd998fe963ff2 WHIRLPOOL b805d76ad747fc8a754fb0ca0439e8f303df057c2b256ed7f57533b311322e4e28b0d8f22111a3c5ad283823c1256cd24c93fec2aeabc6946013c17ab3540dd9
DIST requests-2.8.1.tar.gz 480803 SHA256 84fe8d5bf4dcdcc49002446c47a146d17ac10facf00d9086659064ac43b6c25b SHA512 bccec89165596df3af3f46eb43b5b28b595752485b00ed73978ef76fa6b8a8961c3db046c3f91ff34fa390f037322f6e13b141ba9b600a836a6d798086bd13fb WHIRLPOOL 445e0e12f5900c3396ae7a76d0010b9c4a4ff2c79c51dfc88f117918e436a4d67ea25de39f252cacaabd737b7b1542374172a2b6f482d7ffe1f7514d1cb4a06b
DIST requests-2.9.1.tar.gz 484252 SHA256 c577815dd00f1394203fc44eb979724b098f88264a9ef898ee45b8e5e9cf587f SHA512 0b2b64b2ebb68703f2a222a3e5d0227cf15250319195a13497e38959c64b82359b70221157eab2ab828dfc79bcfec13ede4d6272f0202ae1b22ae79d5810adb9 WHIRLPOOL 9d942b97168c8a869b703db324a263ed3f5279a17e18444f7311e3d3a06aac99ef939c1d3f966025d6ac9e2967415880669b3bac6766c2d39c2faee43cb146c3
diff --git a/dev-python/requests/files/requests-2.12.1-system-packages.patch b/dev-python/requests/files/requests-2.12.1-system-packages.patch
new file mode 100644
index 00000000..62fecf9
--- /dev/null
+++ b/dev-python/requests/files/requests-2.12.1-system-packages.patch
@@ -0,0 +1,17 @@
+--- requests-2.12.1/setup.py
++++ requests-2.12.1/setup.py
+@@ -36,14 +36,6 @@
+ packages = [
+ 'requests',
+ 'requests.packages',
+- 'requests.packages.chardet',
+- 'requests.packages.idna',
+- 'requests.packages.urllib3',
+- 'requests.packages.urllib3.packages',
+- 'requests.packages.urllib3.contrib',
+- 'requests.packages.urllib3.util',
+- 'requests.packages.urllib3.packages.ssl_match_hostname',
+- 'requests.packages.urllib3.packages.backports',
+ ]
+
+ requires = []
diff --git a/dev-python/requests/requests-2.12.1.ebuild b/dev-python/requests/requests-2.12.1.ebuild
new file mode 100644
index 00000000..a4d5ada
--- /dev/null
+++ b/dev-python/requests/requests-2.12.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{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/cryptography-1.3.4[${PYTHON_USEDEP}]
+ >=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+ dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
+ >=dev-python/py-1.4.30[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.14[$(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}"/${PN}-2.12.1-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
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/, dev-python/requests/files/
@ 2016-01-21 11:43 Justin Lecher
0 siblings, 0 replies; 13+ messages in thread
From: Justin Lecher @ 2016-01-21 11:43 UTC (permalink / raw
To: gentoo-commits
commit: bbdfa5280566435e3d278731e2be8d8cc9d9e04e
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 10:33:25 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 11:43:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbdfa528
dev-python/requests: Unbundle system libs
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
.../files/requests-2.9.1-system-packages.patch | 20 ++++++++++++++++++++
...equests-2.9.1.ebuild => requests-2.9.1-r1.ebuild} | 12 ++++++------
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/dev-python/requests/files/requests-2.9.1-system-packages.patch b/dev-python/requests/files/requests-2.9.1-system-packages.patch
new file mode 100644
index 0000000..f511d0d
--- /dev/null
+++ b/dev-python/requests/files/requests-2.9.1-system-packages.patch
@@ -0,0 +1,20 @@
+ setup.py | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index b7ed12b..1d5abe4 100755
+--- a/setup.py
++++ b/setup.py
+@@ -18,12 +18,6 @@ if sys.argv[-1] == 'publish':
+ packages = [
+ 'requests',
+ 'requests.packages',
+- 'requests.packages.chardet',
+- 'requests.packages.urllib3',
+- 'requests.packages.urllib3.packages',
+- 'requests.packages.urllib3.contrib',
+- 'requests.packages.urllib3.util',
+- 'requests.packages.urllib3.packages.ssl_match_hostname',
+ ]
+
+ requires = []
diff --git a/dev-python/requests/requests-2.9.1.ebuild b/dev-python/requests/requests-2.9.1-r1.ebuild
similarity index 82%
rename from dev-python/requests/requests-2.9.1.ebuild
rename to dev-python/requests/requests-2.9.1-r1.ebuild
index 4d4a608..3228f55 100644
--- a/dev-python/requests/requests-2.9.1.ebuild
+++ b/dev-python/requests/requests-2.9.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# 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 pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
@@ -18,7 +18,6 @@ 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"
-# bundles dev-python/urllib3 snapshot
RDEPEND="
app-misc/ca-certificates
>=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
@@ -26,6 +25,7 @@ RDEPEND="
>=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}]
@@ -39,13 +39,13 @@ DEPEND="${RDEPEND}
RESTRICT="test"
PATCHES=(
- "${FILESDIR}"/${PN}-2.2.0-system-chardet.patch
+ "${FILESDIR}"/${P}-system-packages.patch
"${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
)
python_prepare_all() {
- # use system chardet
- rm -r requests/packages/chardet || die
+ # use system chardet & urllib3
+ rm -r requests/packages/{chardet,urllib3} || die
distutils-r1_python_prepare_all
}
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-05-21 12:44 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-27 10:27 [gentoo-commits] repo/gentoo:master commit in: dev-python/requests/, dev-python/requests/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-05-21 12:44 Michał Górny
2023-02-16 20:28 Michał Górny
2022-10-23 5:39 Michał Górny
2022-06-26 6:47 Sam James
2022-06-21 22:58 Sam James
2021-07-28 9:08 Michał Górny
2019-01-27 17:16 Virgil Dupras
2018-01-06 14:13 Michał Górny
2017-05-15 15:48 Manuel Rüger
2017-05-03 11:48 Manuel Rüger
2016-11-30 13:54 Lars Wendler
2016-01-21 11:43 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox