!20 根据openEuler-22.03-LTS-Next包的版本修改安装依赖需要的版本

From: @cherry530 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2022-10-25 09:39:13 +00:00 committed by Gitee
commit 6d40d8490a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 31 additions and 21 deletions

View File

@ -1,27 +1,34 @@
From 198adad886b491c87832109cb268ca8d9708a44e Mon Sep 17 00:00:00 2001 diff -Nur a/setup.py b/setup.py
From: wu-leilei <wu18740459704@163.com> --- a/setup.py 2021-07-16 16:24:38.000000000 +0800
Date: Tue, 1 Mar 2022 14:36:34 +0800 +++ b/setup.py 2022-07-26 10:21:47.296522066 +0800
Subject: [PATCH] fix test @@ -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.
setup.py | 4 ++-- install_requires=[
1 file changed, 2 insertions(+), 2 deletions(-) - "asgiref>=3.2.10,<3.5",
+ "asgiref>=3.2.10",
diff --git a/setup.py b/setup.py "blinker>=1.4, <1.5",
index c6aa15f..325ae3d 100644 "Brotli>=1.0,<1.1",
--- a/setup.py "certifi>=2019.9.11", # no semver here - this should always be on the last release!
+++ b/setup.py "click>=7.0,<8.1",
@@ -81,8 +81,8 @@ setup( - "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", "msgpack>=1.0.0, <1.1.0",
"passlib>=1.6.5, <1.8", "passlib>=1.6.5, <1.8",
"protobuf>=3.14,<3.18", "protobuf>=3.14,<3.18",
- "pyOpenSSL>=20.0,<20.1", - "pyOpenSSL>=20.0,<20.1",
- "pyparsing>=2.4.2,<2.5", - "pyparsing>=2.4.2,<2.5",
+ "pyOpenSSL>=21.0,<21.1", + "pyOpenSSL>=20.0",
+ "pyparsing>=2.4.2,<3.1", + "pyparsing>=2.4.2",
"pyperclip>=1.6.0,<1.9", "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", "sortedcontainers>=2.3,<2.5",
-- "tornado>=4.3,<7",
2.23.0 "urwid>=2.1.1,<2.2",

View File

@ -1,7 +1,7 @@
%global _empty_manifest_terminate_build 0 %global _empty_manifest_terminate_build 0
Name: python-mitmproxy Name: python-mitmproxy
Version: 7.0.0 Version: 7.0.0
Release: 5 Release: 6
Summary: An interactive, SSL/TLS-capable intercepting proxy for HTTP/1, HTTP/2, and WebSockets. Summary: An interactive, SSL/TLS-capable intercepting proxy for HTTP/1, HTTP/2, and WebSockets.
License: MIT License: MIT
URL: https://github.com/mitmproxy/mitmproxy/ URL: https://github.com/mitmproxy/mitmproxy/
@ -75,6 +75,9 @@ mv %{buildroot}/doclist.lst .
%{_docdir}/* %{_docdir}/*
%changelog %changelog
* Tue Oct 25 2022 xu_ping <xuping33@h-partners.com> - 7.0.0-6
- change requires version to fix install issue
* Tue Mar 01 2022 wulei <wulei80@huawei.com> - 7.0.0-5 * Tue Mar 01 2022 wulei <wulei80@huawei.com> - 7.0.0-5
- change requires version - change requires version