Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add urllib3 as dependency #11069

Merged
merged 3 commits into from
Jan 7, 2022
Merged

Add urllib3 as dependency #11069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65653b0
add urllib3 as dependency, remove try/catch
fanny-jiang Jan 7, 2022
05f0e72
sync deps
fanny-jiang Jan 7, 2022
0630018
sync licenses
fanny-jiang Jan 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ tuf,PyPI,Apache-2.0,https://www.updateframework.com
tuf,PyPI,MIT,https://www.updateframework.com
typing,PyPI,PSF,"Guido van Rossum, Jukka Lehtosalo, Łukasz Langa, Ivan Levkivskyi"
uptime,PyPI,BSD-2-Clause,Koen Crolla
urllib3,PyPI,MIT,Andrey Petrov
vertica-python,PyPI,Apache-2.0,"Justin Berka, Alex Kim, Siting Ren"
win-inet-pton,PyPI,Unlicense,Ryan Vennell
wrapt,PyPI,BSD-3-Clause,Graham Dumpleton
7 changes: 4 additions & 3 deletions datadog_checks_base/datadog_checks/base/data/agent_requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ adodbapi==2.6.2.0; sys_platform == "win32"
aerospike==4.0.0; sys_platform != "win32" and sys_platform != "darwin" and python_version < "3.0"
aerospike==6.0.0; sys_platform != "win32" and sys_platform != "darwin" and python_version > "3.0"
aws-requests-auth==0.4.3
beautifulsoup4==4.9.3; python_version < "3.0"
beautifulsoup4==4.10.0; python_version > "3.0"
beautifulsoup4==4.9.3; python_version < "3.0"
binary==1.0.0
boto3==1.17.112; python_version < "3.0"
boto3==1.19.12; python_version > "3.0"
Expand Down Expand Up @@ -73,8 +73,8 @@ pyvmomi==v7.0.2
pywin32==228; sys_platform == "win32" and python_version < "3.0"
pywin32==300; sys_platform == "win32" and python_version > "3.0"
pyyaml==5.4.1
redis==3.5.3; python_version < '3.0'
redis==4.0.1; python_version > '3.0'
redis==3.5.3; python_version < "3.0"
redis==4.0.1; python_version > "3.0"
requests-kerberos==0.12.0
requests-unixsocket==0.2.0
requests==2.25.0
Expand All @@ -95,6 +95,7 @@ tuf==0.17.0; python_version < "3.0"
tuf==0.19.0; python_version > "3.0"
typing==3.7.4.1; python_version < "3.0"
uptime==3.0.1
urllib3==1.26.8
vertica-python==0.10.1
win-inet-pton==1.1.0; sys_platform == "win32" and python_version < "3.0"
wrapt==1.12.1
8 changes: 1 addition & 7 deletions http_check/datadog_checks/http_check/adapters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,7 @@
from requests.adapters import HTTPAdapter
from urllib3.exceptions import SecurityWarning
from urllib3.util import ssl_

# `ssl_match_hostname` package has moved locations from `urllib3.packages.ssl_match_hostname`
# to `urllib3.util.ssl_match_hostname` in urllib3 >= 1.26.8
try:
from urllib3.util.ssl_match_hostname import match_hostname
except ImportError:
from urllib3.packages.ssl_match_hostname import match_hostname
from urllib3.util.ssl_match_hostname import match_hostname


class WeakCiphersHTTPSConnection(urllib3.connection.VerifiedHTTPSConnection):
Expand Down
1 change: 1 addition & 0 deletions http_check/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
cryptography==3.3.2; python_version < '3.0'
cryptography==3.4.8; python_version > "3.0"
requests_ntlm==1.1.0
urllib3==1.26.8