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

Update dependencies #10580

Merged
merged 14 commits into from
Nov 11, 2021
Merged

Update dependencies #10580

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3bc853e
Update dependencies
fanny-jiang Nov 8, 2021
59cdac4
update check dependencies
fanny-jiang Nov 8, 2021
aea6f05
sync 3rd party licenses
fanny-jiang Nov 8, 2021
d96c0e4
remove cachetools
fanny-jiang Nov 8, 2021
3b84711
remove kubernetes
fanny-jiang Nov 8, 2021
c7d3931
remove dnspython
fanny-jiang Nov 8, 2021
226154e
remove cryptography and add back dnspython
fanny-jiang Nov 9, 2021
bf637bd
fix style
fanny-jiang Nov 9, 2021
0f8a76d
address review
fanny-jiang Nov 9, 2021
bc8b21e
remove dnspython
fanny-jiang Nov 9, 2021
6553c11
add dnspython to dep ignored
fanny-jiang Nov 10, 2021
3422324
test
fanny-jiang Nov 10, 2021
321734c
Merge branch 'master' into fanny/update-deps
fanny-jiang Nov 10, 2021
00f7152
revert test
fanny-jiang Nov 11, 2021
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
2 changes: 1 addition & 1 deletion LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PyMySQL,PyPI,MIT,yutaka.matsubara
PySocks,PyPI,BSD-3-Clause,Anorov
PyYAML,PyPI,MIT,Kirill Simonov
Pyro4,PyPI,MIT,Irmen de Jong
adodbapi,PyPI,LGPL-2.1-only,Vernon Cole
adodbapi,PyPI,LGPL-2.1-only,"Henrik Ekelund, Vernon Cole, et.al."
aerospike,PyPI,Apache-2.0,"Aerospike, Inc."
aws-requests-auth,PyPI,BSD-3-Clause,David Muller
beautifulsoup4,PyPI,MIT,Leonard Richardson
Expand Down
2 changes: 1 addition & 1 deletion amazon_msk/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
boto3==1.17.112; python_version < "3.0"
boto3==1.18.48; python_version > "3.0"
boto3==1.19.12; python_version > "3.0"
2 changes: 1 addition & 1 deletion clickhouse/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
clickhouse-cityhash==1.0.2.3
clickhouse-driver==0.2.0; python_version < "3.0"
clickhouse-driver==0.2.1; python_version > "3.0"
clickhouse-driver==0.2.2; python_version > "3.0"
lz4==2.2.1; python_version < '3.0'
lz4==3.1.3; python_version > '3.0'
14 changes: 7 additions & 7 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
@@ -1,19 +1,19 @@
adodbapi==2.6.0.7; sys_platform == "win32"
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"
binary==1.0.0
boto3==1.17.112; python_version < "3.0"
boto3==1.18.48; python_version > "3.0"
boto3==1.19.12; python_version > "3.0"
boto==2.49.0
botocore==1.20.112; python_version < "3.0"
botocore==1.21.48; python_version > "3.0"
botocore==1.22.12; python_version > "3.0"
cachetools==3.1.1
clickhouse-cityhash==1.0.2.3
clickhouse-driver==0.2.0; python_version < "3.0"
clickhouse-driver==0.2.1; python_version > "3.0"
clickhouse-driver==0.2.2; python_version > "3.0"
contextlib2==0.6.0; python_version < "3.0"
cryptography==3.3.2; python_version < "3.0"
cryptography==3.4.8; python_version > "3.0"
Expand All @@ -24,7 +24,7 @@ dnspython==1.16.0
enum34==1.1.10; python_version < "3.0"
flup-py3==1.0.3; python_version > "3.0"
flup==1.0.3.dev-20110405; python_version < "3.0"
foundationdb==6.3.18; python_version > "3.0"
foundationdb==6.3.22; python_version > "3.0"
futures==3.3.0; python_version < "3.0"
gearman==2.0.2; sys_platform != "win32" and python_version < "3.0"
immutables==0.16; python_version > "3.0"
Expand All @@ -35,9 +35,9 @@ jpype1==0.7.1; python_version <= "2.7"
jpype1==1.3.0; python_version > "3"
kafka-python==2.0.2
kazoo==2.8.0
kubernetes==12.0.1
kubernetes==18.20.0
ldap3==2.9.1
lxml==4.6.3
lxml==4.6.4
lz4==2.2.1; python_version < "3.0"
lz4==3.1.3; python_version > "3.0"
mmh3==2.5.1; python_version < "3.0"
Expand Down
4 changes: 2 additions & 2 deletions datadog_checks_base/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
aws-requests-auth==0.4.3
binary==1.0.0
botocore==1.20.112; python_version < "3.0"
botocore==1.21.48; python_version > "3.0"
botocore==1.22.12; python_version > "3.0"
cachetools==3.1.1
contextlib2==0.6.0; python_version < '3.0'
cryptography==3.3.2; python_version < '3.0'
Expand All @@ -11,7 +11,7 @@ ddtrace==0.53.2; sys_platform != "win32" or python_version > "3.0"
enum34==1.1.10; python_version < "3.0"
immutables==0.16; python_version > "3.0"
ipaddress==1.0.23; python_version < "3.0"
kubernetes==12.0.1
kubernetes==18.20.0
mmh3==2.5.1; python_version < '3.0'
mmh3==3.0.0; python_version > '3.0'
orjson==2.6.8; python_version > "3.0"
Expand Down
2 changes: 1 addition & 1 deletion datadog_checks_dependency_provider/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
foundationdb==6.3.18; python_version > '3.0'
foundationdb==6.3.22; python_version > "3.0"
3 changes: 3 additions & 0 deletions datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
'psycopg2-binary', # https://github.com/DataDog/integrations-core/pull/10456
'ddtrace', # https://github.com/DataDog/integrations-core/pull/9132
'flup', # https://github.com/DataDog/integrations-core/pull/1997
# https://github.com/DataDog/integrations-core/pull/10105;
# snowflake-connector-python 2.6.0 has requirement cryptography<4.0.0,>=2.5.0
'cryptography',
}

# Dependencies for the downloader that are security-related and should be updated separately from the others
Expand Down
2 changes: 1 addition & 1 deletion ibm_was/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lxml==4.6.3
lxml==4.6.4
2 changes: 1 addition & 1 deletion sqlserver/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
adodbapi==2.6.0.7; sys_platform == 'win32'
adodbapi==2.6.2.0; sys_platform == 'win32'
pyodbc==4.0.26
pyro4==4.73; sys_platform == 'win32'
pywin32==228; sys_platform == 'win32' and python_version < '3.0'
Expand Down