[gentoo-commits] repo/gentoo:master commit in: dev-python/requests/files/

[gentoo-commits] repo/gentoo:master commit in: dev-python/requests/files/

[David Seifert]

commit:     e2482a285d34385f4f0ea9998b56f2f77d0934d4
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Sep 19 17:44:52 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 21:23:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2482a28

dev-python/requests: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/2362

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../requests/files/requests-2.4.0-system-cacerts.patch     | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/dev-python/requests/files/requests-2.4.0-system-cacerts.patch b/dev-python/requests/files/requests-2.4.0-system-cacerts.patch
deleted file mode 100644
index e3a41d9..00000000
--- a/dev-python/requests/files/requests-2.4.0-system-cacerts.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur requests-2.4.0.orig/requests/certs.py requests-2.4.0/requests/certs.py
---- requests/certs.py	2014-08-20 00:52:58.000000000 +0800
-+++ requests/certs.py	2014-09-09 14:17:33.237264068 +0800
-@@ -18,6 +18,10 @@
- except ImportError:
-     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')
- 

[gentoo-commits] repo/gentoo:master commit in: dev-python/requests/files/

[Matt Thode]

commit:     4ec0fe7ac7dc97f91b3257d1e091ce8ba4874dcb
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 17:41:10 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 17:41:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ec0fe7a

dev-python/requests: add missing patch

Package-Manager: portage-2.3.0

 .../files/requests-2.11.1-system-packages.patch      | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/dev-python/requests/files/requests-2.11.1-system-packages.patch b/dev-python/requests/files/requests-2.11.1-system-packages.patch
new file mode 100644
index 00000000..f511d0d
--- /dev/null
+++ b/dev-python/requests/files/requests-2.11.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 = []

[gentoo-commits] repo/gentoo:master commit in: dev-python/requests/files/

[Mike Frysinger]

commit:     d4610beae1e0e8b250567ba3200c009ad102edbd
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 00:38:11 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 00:38:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4610bea

dev-python/requests: drop unused patch #595974 and restore used one #604560

 .../files/requests-2.11.1-system-packages.patch     | 20 --------------------
 .../files/requests-2.2.0-system-chardet.patch       | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/dev-python/requests/files/requests-2.11.1-system-packages.patch b/dev-python/requests/files/requests-2.11.1-system-packages.patch
deleted file mode 100644
index f511d0d..00000000
--- a/dev-python/requests/files/requests-2.11.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/files/requests-2.2.0-system-chardet.patch b/dev-python/requests/files/requests-2.2.0-system-chardet.patch
new file mode 100644
index 00000000..18fc7a9
--- /dev/null
+++ b/dev-python/requests/files/requests-2.2.0-system-chardet.patch
@@ -0,0 +1,21 @@
+--- 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',

[gentoo-commits] repo/gentoo:master commit in: dev-python/requests/files/

[Aaron Bauman]

commit:     aaaa4d773d49d98b820005e7da7824ef13b27745
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue May 19 19:24:20 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jun  2 04:28:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaaa4d77

dev-python/requests: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../requests/files/requests-2.22.0-pytest-4.patch  | 27 ----------------------
 1 file changed, 27 deletions(-)

diff --git a/dev-python/requests/files/requests-2.22.0-pytest-4.patch b/dev-python/requests/files/requests-2.22.0-pytest-4.patch
deleted file mode 100644
index 5b8ec34912d..00000000000
--- a/dev-python/requests/files/requests-2.22.0-pytest-4.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From dc75b3ca0b4c95648eb07b92cb414394d99c13a0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Mon, 8 Apr 2019 18:04:22 +0200
-Subject: [PATCH] Support pytest 4
-
-Fixes https://github.com/kennethreitz/requests/issues/5048
-
-See https://docs.pytest.org/en/latest/deprecations.html#marks-in-pytest-mark-parametrize
----
- setup.py            | 2 +-
- tests/test_utils.py | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_utils.py b/tests/test_utils.py
-index 59b0b0efa..62c51494d 100644
---- a/tests/test_utils.py
-+++ b/tests/test_utils.py
-@@ -33,7 +33,8 @@ class TestSuperLen:
-         'stream, value', (
-             (StringIO.StringIO, 'Test'),
-             (BytesIO, b'Test'),
--            pytest.mark.skipif('cStringIO is None')((cStringIO, 'Test')),
-+            pytest.param(cStringIO, 'Test',
-+                         marks=pytest.mark.skipif('cStringIO is None')),
-         ))
-     def test_io_streams(self, stream, value):
-         """Ensures that we properly deal with different kinds of IO streams."""

[gentoo-commits] repo/gentoo:master commit in: dev-python/requests/files/

[Michał Górny]

commit:     e1677d9005fffa13c4998c7a868129c111b8d336
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 28 07:05:33 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 28 07:06:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1677d90

dev-python/requests: Update to upstream-approved patch

Upstream does not want to skip the test, so just move the import.
We are skipping it anyway because of Internet access.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../files/requests-2.26.0-trustme-dep.patch        | 30 ++++++++++------------
 1 file changed, 14 insertions(+), 16 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
index b3a81659a9be..5542bb68da90 100644
--- a/dev-python/requests/files/requests-2.26.0-trustme-dep.patch
+++ b/dev-python/requests/files/requests-2.26.0-trustme-dep.patch
@@ -1,22 +1,20 @@
-From 6a1b5cbc124e0c3362ddefae5939db5c216a74db Mon Sep 17 00:00:00 2001
+From 55da533a87afe188282b7f8dfbadeb30c21743d8 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
+Subject: [PATCH] Defer the trustme import until inside the fixture
 
-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.
+Move the trustme import from global scope into the nosan_server fixture
+in order to make it possible to deselect the test via command-line
+when trustme is not available.
 ---
- tests/conftest.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ tests/conftest.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/tests/conftest.py b/tests/conftest.py
-index 099462cf..5d38f254 100644
+index 099462cf52..4f9b2641b4 100644
 --- a/tests/conftest.py
 +++ b/tests/conftest.py
-@@ -13,7 +13,6 @@ import threading
+@@ -13,7 +13,6 @@
  
  import pytest
  from requests.compat import urljoin
@@ -24,14 +22,14 @@ index 099462cf..5d38f254 100644
  
  
  def prepare_url(value):
-@@ -38,6 +37,7 @@ def httpbin_secure(httpbin_secure):
+@@ -38,6 +37,10 @@ def httpbin_secure(httpbin_secure):
  
  @pytest.fixture
  def nosan_server(tmp_path_factory):
-+    trustme = pytest.importorskip('trustme')
++    # delay importing until the fixture in order to make it possible
++    # to deselect the test via command-line when trustme is not available
++    import trustme
++
      tmpdir = tmp_path_factory.mktemp("certs")
      ca = trustme.CA()
      # only commonName, no subjectAltName
--- 
-2.34.1
-

[gentoo-commits] repo/gentoo:master commit in: dev-python/requests/files/

[Michał Górny]

commit:     864998019f36b3ebe80bba480976e58d11bfec48
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Feb 10 11:41:23 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 12:01:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86499801

dev-python/requests: remove unused patch(es)

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24145
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../requests/files/requests-2.26.0-test.patch      | 30 -------------------
 .../files/requests-2.26.0-trustme-dep.patch        | 35 ----------------------
 2 files changed, 65 deletions(-)

diff --git a/dev-python/requests/files/requests-2.26.0-test.patch b/dev-python/requests/files/requests-2.26.0-test.patch
deleted file mode 100644
index 6bbf78871713..000000000000
--- a/dev-python/requests/files/requests-2.26.0-test.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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/files/requests-2.26.0-trustme-dep.patch b/dev-python/requests/files/requests-2.26.0-trustme-dep.patch
deleted file mode 100644
index 5542bb68da90..000000000000
--- a/dev-python/requests/files/requests-2.26.0-trustme-dep.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 55da533a87afe188282b7f8dfbadeb30c21743d8 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] Defer the trustme import until inside the fixture
-
-Move the trustme import from global scope into the nosan_server fixture
-in order to make it possible to deselect the test via command-line
-when trustme is not available.
----
- tests/conftest.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 099462cf52..4f9b2641b4 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -13,7 +13,6 @@
- 
- import pytest
- from requests.compat import urljoin
--import trustme
- 
- 
- def prepare_url(value):
-@@ -38,6 +37,10 @@ def httpbin_secure(httpbin_secure):
- 
- @pytest.fixture
- def nosan_server(tmp_path_factory):
-+    # delay importing until the fixture in order to make it possible
-+    # to deselect the test via command-line when trustme is not available
-+    import trustme
-+
-     tmpdir = tmp_path_factory.mktemp("certs")
-     ca = trustme.CA()
-     # only commonName, no subjectAltName