From cc89a905912f3764ee3f9538e394eb3b3188e832 Mon Sep 17 00:00:00 2001 From: Varsha GS Date: Thu, 7 Dec 2023 16:12:37 +0530 Subject: [PATCH 1/2] - use urllib3>=1.26.18 - remove secure extra feature Signed-off-by: Varsha GS --- setup.py | 2 +- tests/requirements-307.txt | 2 +- tests/requirements-310-with-tornado.txt | 2 +- tests/requirements-310.txt | 2 +- tests/requirements-312.txt | 2 +- tests/requirements-cassandra.txt | 2 +- tests/requirements-gevent.txt | 2 +- tests/requirements.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index d7ad4df3..31fbd716 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ 'protobuf<5.0.0', 'requests>=2.6.0', 'six>=1.12.0', - 'urllib3<1.27,>=1.26.5',], + 'urllib3>=1.26.18',], entry_points={ 'instana': ['string = instana:load'], 'flask': ['string = instana:load'], # deprecated: use same as 'instana' diff --git a/tests/requirements-307.txt b/tests/requirements-307.txt index 7d0b33b5..b6c4c715 100644 --- a/tests/requirements-307.txt +++ b/tests/requirements-307.txt @@ -46,4 +46,4 @@ sqlalchemy>=2.0.0 spyne>=2.14.0 tornado>=4.5.3,<6.0 uvicorn>=0.13.4 -urllib3[secure]<1.27,>=1.26.5 +urllib3>=1.26.18 diff --git a/tests/requirements-310-with-tornado.txt b/tests/requirements-310-with-tornado.txt index 5db0a33b..4c801baf 100644 --- a/tests/requirements-310-with-tornado.txt +++ b/tests/requirements-310-with-tornado.txt @@ -36,4 +36,4 @@ sqlalchemy>=2.0.0 spyne>=2.14.0 uvicorn>=0.13.4 -urllib3[secure]<1.27,>=1.26.5 +urllib3>=1.26.18 diff --git a/tests/requirements-310.txt b/tests/requirements-310.txt index fb609868..3ddaebc6 100644 --- a/tests/requirements-310.txt +++ b/tests/requirements-310.txt @@ -38,4 +38,4 @@ sqlalchemy>=2.0.0 spyne>=2.14.0 uvicorn>=0.13.4 -urllib3[secure]<1.27,>=1.26.5 +urllib3>=1.26.18 diff --git a/tests/requirements-312.txt b/tests/requirements-312.txt index a5c0f6f2..15d7b563 100644 --- a/tests/requirements-312.txt +++ b/tests/requirements-312.txt @@ -42,4 +42,4 @@ sqlalchemy>=2.0.0 spyne>=2.14.0 uvicorn>=0.13.4 -urllib3[secure]<1.27,>=1.26.5 +urllib3>=1.26.18 diff --git a/tests/requirements-cassandra.txt b/tests/requirements-cassandra.txt index 2f2be3e9..3034aa03 100644 --- a/tests/requirements-cassandra.txt +++ b/tests/requirements-cassandra.txt @@ -2,4 +2,4 @@ cassandra-driver>=3.20.2 coverage>=5.5 mock>=2.0.0 pytest>=4.6 -urllib3[secure]<1.27,>=1.26.5 +urllib3>=1.26.18 diff --git a/tests/requirements-gevent.txt b/tests/requirements-gevent.txt index e59d8bf4..257a44cf 100644 --- a/tests/requirements-gevent.txt +++ b/tests/requirements-gevent.txt @@ -4,4 +4,4 @@ gevent>=1.4.0 mock>=2.0.0 pyramid>=2.0.1 pytest>=4.6 -urllib3[secure]<1.27,>=1.26.5 +urllib3>=1.26.18 diff --git a/tests/requirements.txt b/tests/requirements.txt index 42de661e..5bf5a804 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -37,4 +37,4 @@ sqlalchemy>=2.0.0 spyne>=2.14.0 tornado>=4.5.3,<6.0 uvicorn>=0.13.4 -urllib3[secure]<1.27,>=1.26.5 +urllib3>=1.26.18 From df68d7b1d8afe25c2c5207e41a5cd88587583dfd Mon Sep 17 00:00:00 2001 From: Varsha GS Date: Thu, 7 Dec 2023 17:04:24 +0530 Subject: [PATCH 2/2] use urllib3>=1.26.5 Signed-off-by: Varsha GS --- setup.py | 2 +- tests/requirements-307.txt | 2 +- tests/requirements-310-with-tornado.txt | 2 +- tests/requirements-310.txt | 2 +- tests/requirements-312.txt | 2 +- tests/requirements-cassandra.txt | 2 +- tests/requirements-gevent.txt | 2 +- tests/requirements.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index 31fbd716..9bfc8b9a 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ 'protobuf<5.0.0', 'requests>=2.6.0', 'six>=1.12.0', - 'urllib3>=1.26.18',], + 'urllib3>=1.26.5',], entry_points={ 'instana': ['string = instana:load'], 'flask': ['string = instana:load'], # deprecated: use same as 'instana' diff --git a/tests/requirements-307.txt b/tests/requirements-307.txt index b6c4c715..bb1a7dbc 100644 --- a/tests/requirements-307.txt +++ b/tests/requirements-307.txt @@ -46,4 +46,4 @@ sqlalchemy>=2.0.0 spyne>=2.14.0 tornado>=4.5.3,<6.0 uvicorn>=0.13.4 -urllib3>=1.26.18 +urllib3>=1.26.5 diff --git a/tests/requirements-310-with-tornado.txt b/tests/requirements-310-with-tornado.txt index 4c801baf..a6f8b3b5 100644 --- a/tests/requirements-310-with-tornado.txt +++ b/tests/requirements-310-with-tornado.txt @@ -36,4 +36,4 @@ sqlalchemy>=2.0.0 spyne>=2.14.0 uvicorn>=0.13.4 -urllib3>=1.26.18 +urllib3>=1.26.5 diff --git a/tests/requirements-310.txt b/tests/requirements-310.txt index 3ddaebc6..7ff437ef 100644 --- a/tests/requirements-310.txt +++ b/tests/requirements-310.txt @@ -38,4 +38,4 @@ sqlalchemy>=2.0.0 spyne>=2.14.0 uvicorn>=0.13.4 -urllib3>=1.26.18 +urllib3>=1.26.5 diff --git a/tests/requirements-312.txt b/tests/requirements-312.txt index 15d7b563..0594b60e 100644 --- a/tests/requirements-312.txt +++ b/tests/requirements-312.txt @@ -42,4 +42,4 @@ sqlalchemy>=2.0.0 spyne>=2.14.0 uvicorn>=0.13.4 -urllib3>=1.26.18 +urllib3>=1.26.5 diff --git a/tests/requirements-cassandra.txt b/tests/requirements-cassandra.txt index 3034aa03..d924b47c 100644 --- a/tests/requirements-cassandra.txt +++ b/tests/requirements-cassandra.txt @@ -2,4 +2,4 @@ cassandra-driver>=3.20.2 coverage>=5.5 mock>=2.0.0 pytest>=4.6 -urllib3>=1.26.18 +urllib3>=1.26.5 diff --git a/tests/requirements-gevent.txt b/tests/requirements-gevent.txt index 257a44cf..36c23632 100644 --- a/tests/requirements-gevent.txt +++ b/tests/requirements-gevent.txt @@ -4,4 +4,4 @@ gevent>=1.4.0 mock>=2.0.0 pyramid>=2.0.1 pytest>=4.6 -urllib3>=1.26.18 +urllib3>=1.26.5 diff --git a/tests/requirements.txt b/tests/requirements.txt index 5bf5a804..26a85e1a 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -37,4 +37,4 @@ sqlalchemy>=2.0.0 spyne>=2.14.0 tornado>=4.5.3,<6.0 uvicorn>=0.13.4 -urllib3>=1.26.18 +urllib3>=1.26.5