PR#7: Update to 2.23.0 - rpms/python-requests

rpms / python-requests

#7 Update to 2.23.0

Merged 4 years ago by bowlofeggs. Opened 4 years ago by bowlofeggs.

rpms/ bowlofeggs/python-requests 1804863 into master

Randy Barlow • 4 years ago

f9d62a3

.gitignore

file modified

		`@@ -42,3 +42,4 @@`
		`/requests-v2.20.0.tar.gz`
		`/requests-v2.21.0.tar.gz`
		`/requests-v2.22.0.tar.gz`
		`+ /requests-v2.23.0.tar.gz`

Remove-tests-that-use-the-tarpit.patch

file modified

+5 -5

		`@@ -1,4 +1,4 @@`
		`- From 524cd22fb77e69db9bb3f017bbb1d9782c37b0cd Mon Sep 17 00:00:00 2001`
		`+ From bb1c91432c5e9a1f402692db5c80c65136656afb Mon Sep 17 00:00:00 2001`
		`From: Jeremy Cline <jeremy@jcline.org>`
		`Date: Tue, 13 Jun 2017 09:08:09 -0400`
		`Subject: [PATCH] Remove tests that use the tarpit`
		`@@ -15,10 +15,10 @@`
		`1 file changed, 25 deletions(-)`

		`diff --git a/tests/test_requests.py b/tests/test_requests.py`
		`- index b8350cb..46b7e9e 100755`
		`+ index 7d4a4eb5..8d1c55fc 100644`
		`--- a/tests/test_requests.py`
		`+++ b/tests/test_requests.py`
		`- @@ -2049,31 +2049,6 @@ class TestTimeout:`
		`+ @@ -2186,31 +2186,6 @@ class TestTimeout:`
		`except ReadTimeout:`
		`pass`

		`@@ -48,8 +48,8 @@`
		`- pass`
		`-`
		`def test_encoded_methods(self, httpbin):`
		`- """See: https://github.com/requests/requests/issues/2316"""`
		`+ """See: https://github.com/psf/requests/issues/2316"""`
		`r = requests.request(b'GET', httpbin('get'))`
		`--`
		`- 2.9.4`
		`+ 2.24.1`

patch-requests-certs.py-to-use-the-system-CA-bundle.patch

file modified

+5 -5

		`@@ -1,4 +1,4 @@`
		`- From d5a4f2908fab5ca16eb59db8b18eda7a94a37b04 Mon Sep 17 00:00:00 2001`
		`+ From aad5590d5ea47dc54cfd97da54f2640014f7d39d Mon Sep 17 00:00:00 2001`
		`From: Jeremy Cline <jcline@redhat.com>`
		`Date: Thu, 13 Dec 2018 10:55:29 -0500`
		`Subject: [PATCH] Patch requests/certs.py to use the system CA bundle`
		`@@ -30,17 +30,17 @@`
		`if __name__ == '__main__':`
		`print(where())`
		`diff --git a/setup.py b/setup.py`
		`- index 10ce2c62..1f3b2bde 100755`
		`+ index 2da9ba07..851d9a42 100755`
		`--- a/setup.py`
		`+++ b/setup.py`
		`@@ -45,7 +45,6 @@ requires = [`
		`- 'chardet>=3.0.2,<3.1.0',`
		`- 'idna>=2.5,<2.9',`
		`+ 'chardet>=3.0.2,<4',`
		`+ 'idna>=2.5,<3',`
		`'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1',`
		`- 'certifi>=2017.4.17'`

		`]`
		`test_requirements = [`
		`--`
		`- 2.19.2`
		`+ 2.24.1`

python-requests.spec

file modified

+12 -5

		`@@ -9,8 +9,8 @@`


		`Name: python-requests`
		`- Version: 2.22.0`
		`- Release: 8%{?dist}`
		`+ Version: 2.23.0`
		`+ Release: 1%{?dist}`
		`Summary: HTTP library, written in Python, for human beings`

		`License: ASL 2.0`
		`@@ -36,9 +36,6 @@`
		`# https://bugzilla.redhat.com/show_bug.cgi?id=1653223`
		`Patch5: requests-2.20.0-no-py2-httpbin.patch`

		`- # https://github.com/kennethreitz/requests/pull/5049`
		`- Patch6: support-pytest-4.patch`
		`-`
		`BuildArch: noarch`

		`%description`
		`@@ -56,6 +53,7 @@`
		`BuildRequires: python%{python3_pkgversion}-chardet`
		`BuildRequires: python%{python3_pkgversion}-urllib3`
		`BuildRequires: python%{python3_pkgversion}-idna`
		`+ BuildRequires: python%{python3_pkgversion}-pygments`
		`%if %{with tests}`
		`BuildRequires: python%{python3_pkgversion}-pytest`
		`BuildRequires: python%{python3_pkgversion}-pytest-cov`
		`@@ -82,6 +80,11 @@`
		`# env shebang in nonexecutable file`
		`sed -i '/#!\/usr\/.*python/d' requests/certs.py`

		`+ # Some doctests use the internet and fail to pass in Koji. Since doctests don't have names, I don't`
		`+ # know a way to skip them. We also don't want to patch them out, because patching them out will`
		`+ # change the docs. Thus, we set pytest not to run doctests at all.`
		`+ sed -i 's/ --doctest-modules//' pytest.ini`
		`+`
		`%build`
		`%py3_build`

		`@@ -103,6 +106,10 @@`


		`%changelog`
		`+ * Fri Feb 21 2020 Randy Barlow <bowlofeggs@fedoraproject.org> - 2.23.0-1`
		`+ - Update to 2.23.0 (#1804863).`
		`+ - https://requests.readthedocs.io/en/latest/community/updates/`
		`+`
		`* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.22.0-8`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (requests-v2.22.0.tar.gz) = 1259c270e343fc860322b105904232226f26b3b363e9d102d599020fcc7b6e1d524dc6c650181ce3152caebe11d2c60045ddd9c9fc04560294caa284e209c386`
		`+ SHA512 (requests-v2.23.0.tar.gz) = a8e670d928fce3531629a6d73ee6b47882f3eba47684841bfce44376781b2b9c5c97186e1750ee582b0c11fa67c983f340f95eb2a4f19042f4cbc77ae090a69c`

support-pytest-4.patch

file removed

-26

		`@@ -1,26 +0,0 @@`
		`- From 7a33a8e523be6aa40c7e5435d3c5d92f2cc6e9a0 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`
		`- ---`
		`- tests/test_utils.py \| 3 ++-`
		`- 1 file changed, 2 insertions(+), 1 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."""`