From 2207931fff22e24e5a54f62f85969238af9c5804 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Thu, 22 Mar 2018 13:50:56 -0500 Subject: [PATCH] remove mitmproxy mitmproxt is only used by mitmstack and rpm-packaging, both of which we do not care about. Change-Id: Ibb2da2a98b78bbb4597b6fd1106103f6ae9e97ee --- global-requirements.txt | 1 - lower-constraints-xfails.txt | 5 +---- lower-constraints.txt | 2 -- openstack_requirements/tests/files/upper-constraints.txt | 2 -- upper-constraints-xfails.txt | 5 +---- upper-constraints.txt | 2 -- 6 files changed, 2 insertions(+), 15 deletions(-) diff --git a/global-requirements.txt b/global-requirements.txt index bd9b5da8c5..6d697fc744 100644 --- a/global-requirements.txt +++ b/global-requirements.txt @@ -110,7 +110,6 @@ marathon>=0.8.6,!=0.9.1 # MIT microversion-parse>=0.1.2 # Apache-2.0 mistral-lib>=0.3.0 # Apache-2.0 mistral-extra>=5.2.0 # Apache-2.0 -mitmproxy>=1.0.2;python_version>'3.0' # MIT monasca-common>=2.7.0 # Apache-2.0 monasca-statsd>=1.1.0 # Apache-2.0 monotonic>=0.6 # Apache-2.0 diff --git a/lower-constraints-xfails.txt b/lower-constraints-xfails.txt index b2753d9791..695cb3da6e 100644 --- a/lower-constraints-xfails.txt +++ b/lower-constraints-xfails.txt @@ -1,6 +1,3 @@ # Format is # ==; -pyopenssl==16.2.0;mitmproxy -pyperclip==1.5.27;mitmproxy -pyasn1==0.1.8;mitmproxy -cryptography==1.9;mitmproxy +# e.g. pyopenssl==16.2.0;mitmproxy diff --git a/lower-constraints.txt b/lower-constraints.txt index f65a5d5c6e..f00396c75b 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -414,8 +414,6 @@ dulwich===0.15.0 pykafka===2.5.0 setuptools===21.0.0 kombu===4.0.0 -mitmproxy===1.0.2;python_version=='3.4' -mitmproxy===1.0.2;python_version=='3.5' betamax-matchers===0.4.0 yaql===1.1.3 requestsexceptions===1.2.0 diff --git a/openstack_requirements/tests/files/upper-constraints.txt b/openstack_requirements/tests/files/upper-constraints.txt index fba20cffc5..0920ede675 100644 --- a/openstack_requirements/tests/files/upper-constraints.txt +++ b/openstack_requirements/tests/files/upper-constraints.txt @@ -370,8 +370,6 @@ h2===2.6.0;python_version=='3.5' dulwich===0.17.1 pykafka===2.5.0 kombu===4.0.1 -mitmproxy===2.0.0;python_version=='3.4' -mitmproxy===2.0.0;python_version=='3.5' yaql===1.1.3 requestsexceptions===1.2.0 testresources===2.0.1 diff --git a/upper-constraints-xfails.txt b/upper-constraints-xfails.txt index 16e9251a0d..e57ea84cca 100644 --- a/upper-constraints-xfails.txt +++ b/upper-constraints-xfails.txt @@ -1,6 +1,3 @@ # Format is # ==; -pyopenssl==17.5.0;mitmproxy -pyperclip==1.6.0;mitmproxy -pyasn1==0.4.2;mitmproxy -cryptography==2.1.4;mitmproxy +# e.g. pyopenssl==17.5.0;mitmproxy diff --git a/upper-constraints.txt b/upper-constraints.txt index cfca433e6b..3012512e73 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -409,8 +409,6 @@ h2===3.0.1;python_version=='3.5' dulwich===0.19.0 pykafka===2.7.0 kombu===4.1.0 -mitmproxy===3.0.3;python_version=='3.4' -mitmproxy===3.0.3;python_version=='3.5' betamax-matchers===0.4.0 yaql===1.1.3 requestsexceptions===1.4.0