From 55f9f4f7ceaa954105fb50c36c28b48b5acea9e3 Mon Sep 17 00:00:00 2001 From: cherry530 Date: Tue, 25 Oct 2022 15:42:19 +0800 Subject: [PATCH] Next branches some packages upgrade,so change requires version Signed-off-by: cherry530 --- change-requires-version.patch | 47 ++++++++++++++++++++--------------- python-mitmproxy.spec | 5 +++- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/change-requires-version.patch b/change-requires-version.patch index 6998c49..c3c9e33 100644 --- a/change-requires-version.patch +++ b/change-requires-version.patch @@ -1,27 +1,34 @@ -From 198adad886b491c87832109cb268ca8d9708a44e Mon Sep 17 00:00:00 2001 -From: wu-leilei -Date: Tue, 1 Mar 2022 14:36:34 +0800 -Subject: [PATCH] fix test - ---- - setup.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index c6aa15f..325ae3d 100644 ---- a/setup.py -+++ b/setup.py -@@ -81,8 +81,8 @@ setup( +diff -Nur a/setup.py b/setup.py +--- a/setup.py 2021-07-16 16:24:38.000000000 +0800 ++++ b/setup.py 2022-07-26 10:21:47.296522066 +0800 +@@ -66,13 +66,13 @@ + # https://packaging.python.org/en/latest/requirements/#install-requires + # It is not considered best practice to use install_requires to pin dependencies to specific versions. + install_requires=[ +- "asgiref>=3.2.10,<3.5", ++ "asgiref>=3.2.10", + "blinker>=1.4, <1.5", + "Brotli>=1.0,<1.1", + "certifi>=2019.9.11", # no semver here - this should always be on the last release! + "click>=7.0,<8.1", +- "cryptography>=3.3,<3.5", +- "flask>=1.1.1,<2.1", ++ "cryptography>=3.3", ++ "flask>=1.1.1", + "h11>=0.11,<0.13", + "h2>=4.0,<5", + "hyperframe>=6.0,<7", +@@ -81,10 +81,10 @@ "msgpack>=1.0.0, <1.1.0", "passlib>=1.6.5, <1.8", "protobuf>=3.14,<3.18", - "pyOpenSSL>=20.0,<20.1", - "pyparsing>=2.4.2,<2.5", -+ "pyOpenSSL>=21.0,<21.1", -+ "pyparsing>=2.4.2,<3.1", ++ "pyOpenSSL>=20.0", ++ "pyparsing>=2.4.2", "pyperclip>=1.6.0,<1.9", - "ruamel.yaml>=0.16,<0.17.11", +- "ruamel.yaml>=0.16,<0.17.11", ++ "ruamel.yaml>=0.16", "sortedcontainers>=2.3,<2.5", --- -2.23.0 - + "tornado>=4.3,<7", + "urwid>=2.1.1,<2.2", diff --git a/python-mitmproxy.spec b/python-mitmproxy.spec index 12c381f..c00c6a9 100644 --- a/python-mitmproxy.spec +++ b/python-mitmproxy.spec @@ -1,7 +1,7 @@ %global _empty_manifest_terminate_build 0 Name: python-mitmproxy Version: 7.0.0 -Release: 5 +Release: 6 Summary: An interactive, SSL/TLS-capable intercepting proxy for HTTP/1, HTTP/2, and WebSockets. License: MIT URL: https://github.com/mitmproxy/mitmproxy/ @@ -75,6 +75,9 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Tue Oct 25 2022 xu_ping - 7.0.0-6 +- change requires version to fix install issue + * Tue Mar 01 2022 wulei - 7.0.0-5 - change requires version -- Gitee