From c3e7e42530c00aa3cfeb6081becf57d56a882f7250862a7697cf0627f4a978c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Mon, 24 Feb 2020 15:21:03 +0000 Subject: [PATCH] - update to 2.23.0 - dropped merged_pr_5049.patch - refreshed requests-no-hardcoded-version.patch * Remove defunct reference to prefetch in Session __attrs__ * Requests no longer outputs password in basic auth usage warning OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests?expand=0&rev=138 --- merged_pr_5049.patch | 27 --------------------------- python-requests.changes | 9 +++++++++ python-requests.spec | 5 ++--- requests-2.22.0.tar.gz | 3 --- requests-2.23.0.tar.gz | 3 +++ requests-no-hardcoded-version.patch | 13 ++++++------- 6 files changed, 20 insertions(+), 40 deletions(-) delete mode 100644 merged_pr_5049.patch delete mode 100644 requests-2.22.0.tar.gz create mode 100644 requests-2.23.0.tar.gz diff --git a/merged_pr_5049.patch b/merged_pr_5049.patch deleted file mode 100644 index d6ba7aa..0000000 --- a/merged_pr_5049.patch +++ /dev/null @@ -1,27 +0,0 @@ -From dc75b3ca0b4c95648eb07b92cb414394d99c13a0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -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.""" diff --git a/python-requests.changes b/python-requests.changes index ccc3e50..674cdb2 100644 --- a/python-requests.changes +++ b/python-requests.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Feb 24 15:19:16 UTC 2020 - Ondřej Súkup + +- update to 2.23.0 +- dropped merged_pr_5049.patch +- refreshed requests-no-hardcoded-version.patch + * Remove defunct reference to prefetch in Session __attrs__ + * Requests no longer outputs password in basic auth usage warning + ------------------------------------------------------------------- Sat Dec 14 22:48:50 UTC 2019 - Stefan Brüns diff --git a/python-requests.spec b/python-requests.spec index 7d74405..31dcccb 100644 --- a/python-requests.spec +++ b/python-requests.spec @@ -1,7 +1,7 @@ # # spec file for package python-requests # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ %endif %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-requests%{psuffix} -Version: 2.22.0 +Version: 2.23.0 Release: 0 Summary: Python HTTP Library License: Apache-2.0 @@ -36,7 +36,6 @@ Source: https://files.pythonhosted.org/packages/source/r/requests/reques # PATCH-FIX-SUSE: do not hardcode versions in setup.py/requirements Patch0: requests-no-hardcoded-version.patch Patch1: pr_5251-pytest5.patch -Patch2: merged_pr_5049.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros diff --git a/requests-2.22.0.tar.gz b/requests-2.22.0.tar.gz deleted file mode 100644 index 39bacc5..0000000 --- a/requests-2.22.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 -size 113406 diff --git a/requests-2.23.0.tar.gz b/requests-2.23.0.tar.gz new file mode 100644 index 0000000..ff73beb --- /dev/null +++ b/requests-2.23.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6 +size 114327 diff --git a/requests-no-hardcoded-version.patch b/requests-no-hardcoded-version.patch index 26d0cd1..1a41c07 100644 --- a/requests-no-hardcoded-version.patch +++ b/requests-no-hardcoded-version.patch @@ -1,17 +1,16 @@ -Index: requests-2.22.0/setup.py +Index: requests-2.23.0/setup.py =================================================================== ---- requests-2.22.0.orig/setup.py -+++ requests-2.22.0/setup.py +--- requests-2.23.0.orig/setup.py ++++ requests-2.23.0/setup.py @@ -42,14 +42,14 @@ if sys.argv[-1] == 'publish': packages = ['requests'] requires = [ -- 'chardet>=3.0.2,<3.1.0', -- 'idna>=2.5,<2.9', -- 'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1', +- 'chardet>=3.0.2,<4', +- 'idna>=2.5,<3', + 'chardet>=3.0.2', + 'idna>=2.5', -+ 'urllib3>=1.21.1', + 'urllib3>=1.21.1,<1.26,!=1.25.0,!=1.25.1', 'certifi>=2017.4.17' ]