From 4f989cc847459869496c7b6e3a9574aff47d028b Mon Sep 17 00:00:00 2001 From: zhang-liang-pengkun Date: Fri, 22 Dec 2023 17:00:00 +0800 Subject: [PATCH] upgrade pyopenssl Signed-off-by: zhang-liang-pengkun --- 0003-upgrade-pyopenssl.patch | 63 ++++++++++++++++++++++++++++++++++++ python-httpretty.spec | 8 +++-- 2 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 0003-upgrade-pyopenssl.patch diff --git a/0003-upgrade-pyopenssl.patch b/0003-upgrade-pyopenssl.patch new file mode 100644 index 0000000..28ff64d --- /dev/null +++ b/0003-upgrade-pyopenssl.patch @@ -0,0 +1,63 @@ +From 7c08885833d762fcd87d30b79a5c1ef040c417e4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gabriel=20Falc=C3=A3o?= +Date: Sun, 4 Nov 2018 23:26:50 +0100 +Subject: [PATCH] upgrade pyopenssl + +--- + Pipfile | 2 +- + Pipfile.lock | 10 +++++----- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Pipfile b/Pipfile +index 08a25ca..fea9afc 100644 +--- a/Pipfile ++++ b/Pipfile +@@ -25,7 +25,7 @@ twine = "*" + "pathlib2" = "*" + tox = "*" + singledispatch = "*" +-pyopenssl = "==16.2.0" ++pyopenssl = ">=17.5.0" + cryptography = "==2.3" + "urllib3" = "*" + +diff --git a/Pipfile.lock b/Pipfile.lock +index c3a84d8..7b38385 100644 +--- a/Pipfile.lock ++++ b/Pipfile.lock +@@ -1,7 +1,7 @@ + { + "_meta": { + "hash": { +- "sha256": "beb86f7a194c4238aae9dc9e45b8485e3116771c1b2c8ad92073c43500b550db" ++ "sha256": "f11beddc237b47a812d3156297d5766d8c7840a5e655e5855e0f73e096474c63" + }, + "pipfile-spec": 6, + "requires": { +@@ -221,7 +221,7 @@ + "sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79", + "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1" + ], +- "markers": "python_version < '3'", ++ "markers": "python_version < '3.4'", + "version": "==1.1.6" + }, + "filelock": { +@@ -462,11 +462,11 @@ + }, + "pyopenssl": { + "hashes": [ +- "sha256:26ca380ddf272f7556e48064bbcd5bd71f83dfc144f3583501c7ddbd9434ee17", +- "sha256:7779a3bbb74e79db234af6a08775568c6769b5821faecf6e2f4143edb227516e" ++ "sha256:26ff56a6b5ecaf3a2a59f132681e2a80afcc76b4f902f612f518f92c2a1bf854", ++ "sha256:6488f1423b00f73b7ad5167885312bb0ce410d3312eb212393795b53c8caa580" + ], + "index": "pypi", +- "version": "==16.2.0" ++ "version": "==18.0.0" + }, + "pyparsing": { + "hashes": [ +-- +2.39.0.windows.2 + diff --git a/python-httpretty.spec b/python-httpretty.spec index 0f2a469..e5d5b92 100644 --- a/python-httpretty.spec +++ b/python-httpretty.spec @@ -1,6 +1,6 @@ Name: python-httpretty Version: 0.9.5 -Release: 6 +Release: 7 Summary: HTTP Client mocking tool for Python License: MIT URL: https://pypi.org/project/httpretty/ @@ -9,7 +9,8 @@ Source0: https://files.pythonhosted.org/packages/source/h/httpretty/httpr Patch0001: python-httpretty-fakesock_getpeercert_noconnect.patch Patch0002: 0001-Handle-bugs-in-older-urllib3-versions-in-one-of-the-.patch Patch0003: 0001-Call-reset-from-setUp-and-tearDown-in-addition-to-en.patch -Patch0004: 0001-modify-python3.9-supportive-syntax.patch +Patch0004: 0001-modify-python3.9-supportive-syntax.patch +Patch0005: 0003-upgrade-pyopenssl.patch BuildArch: noarch @@ -52,6 +53,9 @@ LANG=en_US.UTF-8 %{__python3} -m nose2 -v %{python3_sitelib}/httpretty-%{version}-py3.?.egg-info %changelog +* Fri Dec 22 2023 zhangliangpengkun - 0.9.5-7 +- upgrade pyopenssl + * Mon Jan 10 2022 baizhonggui - 0.9.5-6 - Replace nose from nose2 dependence. -- Gitee