From 5b9ed35956712a83433fe9719fe3ff529849d6d8 Mon Sep 17 00:00:00 2001 From: wang--ge Date: Mon, 1 Apr 2024 16:49:49 +0800 Subject: [PATCH] modify installation dependency version limit (cherry picked from commit ee8ccbd098a870f6a3f0f5750b96412198562424) (cherry picked from commit 67b0d0916fe411fde0ee7952008dcb1fb89f12c3) --- 0001-change-requires-version.patch | 16 ++++++++++------ python-mitmproxy.spec | 5 ++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/0001-change-requires-version.patch b/0001-change-requires-version.patch index 27c7f91..39cf38a 100644 --- a/0001-change-requires-version.patch +++ b/0001-change-requires-version.patch @@ -1,5 +1,5 @@ diff --git a/setup.py b/setup.py -index 94ef426..7661a0e 100644 +index 94ef426..bd1c511 100644 --- a/setup.py +++ b/setup.py @@ -73,10 +73,10 @@ setup( @@ -7,24 +7,28 @@ index 94ef426..7661a0e 100644 # It is not considered best practice to use install_requires to pin dependencies to specific versions. install_requires=[ - "asgiref>=3.2.10,<3.6", +- "Brotli>=1.0,<1.1", + "asgiref>=3.2.10", - "Brotli>=1.0,<1.1", ++ "Brotli>=1.0,<=1.1.0", "certifi>=2019.9.11", # no semver here - this should always be on the last release! - "cryptography>=38.0,<38.1", + "cryptography>=38.0", "flask>=1.1.1,<2.3", "h11>=0.11,<0.15", "h2>=4.1,<5", -@@ -87,7 +87,7 @@ setup( +@@ -87,16 +87,16 @@ setup( "msgpack>=1.0.0, <1.1.0", "passlib>=1.6.5, <1.8", "protobuf>=3.14,<5", - "pyOpenSSL>=22.1,<22.2", +- "pyparsing>=2.4.2,<3.1", + "pyOpenSSL>=22.1", - "pyparsing>=2.4.2,<3.1", ++ "pyparsing>=2.4.2,<=3.1.1", "pyperclip>=1.6.0,<1.9", - "ruamel.yaml>=0.16,<0.18", -@@ -96,7 +96,7 @@ setup( +- "ruamel.yaml>=0.16,<0.18", ++ "ruamel.yaml>=0.16,<=0.18.6", + "sortedcontainers>=2.3,<2.5", + "tornado>=6.1,<7", "urwid>=2.1.1,<2.2", "wsproto>=1.0,<1.3", "publicsuffix2>=2.20190812,<3", diff --git a/python-mitmproxy.spec b/python-mitmproxy.spec index b704938..4be2d3a 100644 --- a/python-mitmproxy.spec +++ b/python-mitmproxy.spec @@ -1,7 +1,7 @@ %global _empty_manifest_terminate_build 0 Name: python-mitmproxy Version: 9.0.1 -Release: 1 +Release: 2 Summary: An interactive, SSL/TLS-capable intercepting proxy for HTTP/1, HTTP/2, and WebSockets. License: MIT URL: https://github.com/mitmproxy/mitmproxy/ @@ -74,6 +74,9 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Mon Apr 01 2024 Ge Wang - 9.0.1-2 +- Modify installation dependency version limit + * Tue Sep 19 2023 xu_ping <707078654@qq.com> - 9.0.1-1 - Upgrade version to 9.0.1 - add Raw UDP and DTLS support. -- Gitee