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

Jump to bottom

Bump dependencies for Agent 7.47 #15145

Merged
merged 7 commits into from
Jul 6, 2023
Merged

Bump dependencies for Agent 7.47 #15145

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0e62841
Bump dependencies for Agent 7.47
FlorentClarret Jul 4, 2023
96026dc
roll back breaking changes for protobuf and pydantic
iliakur Jul 4, 2023
546895e
revert dependency updates for vsphere and tls
iliakur Jul 4, 2023
c89be9f
undo pymongo upgrade, our license validation cannot handle new metadata
iliakur Jul 5, 2023
5124ec1
update 3rdparty licenses
iliakur Jul 5, 2023
2c33a0e
revert some more protobuf upgrades
iliakur Jul 5, 2023
1e2d595
remove protobuf license
iliakur Jul 5, 2023
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
3 changes: 2 additions & 1 deletion LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ prometheus-client,PyPI,Apache-2.0,Copyright 2015 Brian Brazil
prometheus-client,PyPI,Apache-2.0,Copyright 2015 The Prometheus Authors
protobuf,PyPI,BSD-3-Clause,Copyright 2008 Google Inc.
protobuf,PyPI,BSD-3-Clause,Copyright 2008 Google Inc. All rights reserved.
protobuf,PyPI,BSD-3-Clause,Copyright 2014 [email protected]
psutil,PyPI,BSD-3-Clause,"Copyright (c) 2009, Jay Loden, Dave Daeschler, Giampaolo Rodola'"
psycopg2-binary,PyPI,BSD-3-Clause,Copyright 2013 Federico Di Gregorio
psycopg2-binary,PyPI,LGPL-3.0-only,Copyright (C) 2013 Federico Di Gregorio
Expand Down Expand Up @@ -108,4 +109,4 @@ typing,PyPI,PSF,"Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amste
uptime,PyPI,BSD-2-Clause,"Copyright (c) 2012, Koen Crolla"
vertica-python,PyPI,Apache-2.0,"Copyright 2013 Justin Berka, Alex Kim, Siting Ren"
win-inet-pton,PyPI,Unlicense,Ryan Vennell. win-inet-pton is dedicated to the public domain under Unlicense.
wrapt,PyPI,BSD-3-Clause,"Copyright (c) 2013-2022, Graham Dumpleton"
wrapt,PyPI,BSD-3-Clause,"Copyright (c) 2013-2023, Graham Dumpleton"
2 changes: 1 addition & 1 deletion active_directory/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dynamic = [
[project.optional-dependencies]
deps = [
"pywin32==228; sys_platform == 'win32' and python_version < '3.0'",
"pywin32==304; sys_platform == 'win32' and python_version > '3.0'",
"pywin32==306; sys_platform == 'win32' and python_version > '3.0'",
]

[project.urls]
Expand Down
3 changes: 1 addition & 2 deletions amazon_msk/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,12 @@ dependencies = [
dynamic = [
"version",
]

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ofek do you know what this is about? did we change the tool we use to write toml files?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Somebody must have manually added an extra line at some point

license = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"boto3==1.17.112; python_version < '3.0'",
"boto3==1.26.138; python_version > '3.0'",
"boto3==1.27.0; python_version > '3.0'",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion aspdotnet/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dynamic = [
[project.optional-dependencies]
deps = [
"pywin32==228; sys_platform == 'win32' and python_version < '3.0'",
"pywin32==304; sys_platform == 'win32' and python_version > '3.0'",
"pywin32==306; sys_platform == 'win32' and python_version > '3.0'",
]

[project.urls]
Expand Down
3 changes: 2 additions & 1 deletion cloud_foundry_api/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ dynamic = [

[project.optional-dependencies]
deps = [
"semver==2.13.0",
"semver==2.13.0; python_version < '3.0'",
"semver==3.0.1; python_version > '3.0'",
]

[project.urls]
Expand Down
37 changes: 20 additions & 17 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 @@ -5,12 +5,12 @@ beautifulsoup4==4.12.2; 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.26.138; python_version > '3.0'
boto3==1.27.0; python_version > '3.0'
boto==2.49.0
botocore==1.20.112; python_version < '3.0'
botocore==1.29.138; python_version > '3.0'
botocore==1.30.0; python_version > '3.0'
cachetools==3.1.1; python_version < '3.0'
cachetools==5.3.0; python_version > '3.0'
cachetools==5.3.1; python_version > '3.0'
clickhouse-cityhash==1.0.2.3; python_version < '3.0'
clickhouse-cityhash==1.0.2.4; python_version > '3.0'
clickhouse-driver==0.2.0; python_version < '3.0'
Expand All @@ -32,7 +32,7 @@ importlib-metadata==2.1.3; python_version < '3.8'
in-toto==1.0.1; python_version > '3.0'
ipaddress==1.0.23; python_version < '3.0'
jaydebeapi==1.2.3
jellyfish==0.11.2; python_version > '3.0'
jellyfish==1.0.0; python_version > '3.0'
jpype1==1.4.1; python_version > '3.0'
kubernetes==18.20.0; python_version < '3.0'
kubernetes==26.1.0; python_version > '3.0'
Expand All @@ -45,14 +45,14 @@ mmh3==4.0.0; python_version > '3.0'
oauthlib==3.1.0; python_version < '3.0'
oauthlib==3.2.2; python_version > '3.0'
openstacksdk==1.0.1; python_version > '3.0'
oracledb==1.3.1; python_version >= '3.8'
orjson==3.8.12; python_version > '3.0'
oracledb==1.3.2; python_version >= '3.8'
orjson==3.9.1; python_version > '3.0'
packaging==23.1; python_version > '3.0'
paramiko==2.12.0; python_version < '3.0'
paramiko==3.1.0; python_version > '3.0'
paramiko==3.2.0; python_version > '3.0'
ply==3.11
prometheus-client==0.12.0; python_version < '3.0'
prometheus-client==0.16.0; python_version > '3.0'
prometheus-client==0.17.0; python_version > '3.0'
protobuf==3.17.3; python_version < '3.0'
protobuf==3.20.2; python_version > '3.0'
psutil==5.9.0
Expand All @@ -63,7 +63,7 @@ pydantic==1.10.8; python_version > '3.0'
pyjwt==1.7.1; python_version < '3.0'
pyjwt==2.7.0; python_version > '3.0'
pymongo[srv]==4.3.3; python_version >= '3.8'
pymqi==1.12.8; sys_platform != 'darwin' or platform_machine != 'arm64'
pymqi==1.12.10; sys_platform != 'darwin' or platform_machine != 'arm64'
pymysql==0.10.1
pyodbc==4.0.32; sys_platform != 'darwin' or platform_machine != 'arm64'
pyro4==4.82; sys_platform == 'win32'
Expand All @@ -72,19 +72,20 @@ pysnmp-mibs==0.1.6
pysnmp==4.4.9
pysocks==1.7.1
python-binary-memcached==0.26.1; sys_platform != 'win32' and python_version < '3.0'
python-binary-memcached==0.31.1; sys_platform != 'win32' and python_version > '3.0'
python-binary-memcached==0.31.2; sys_platform != 'win32' and python_version > '3.0'
python-dateutil==2.8.2
python3-gearman==0.1.0; sys_platform != 'win32' and python_version > '3.0'
pyvmomi==7.0.3
pywin32==228; sys_platform == 'win32' and python_version < '3.0'
pywin32==304; sys_platform == 'win32' and python_version > '3.0'
pywin32==306; sys_platform == 'win32' and python_version > '3.0'
pyyaml==5.4.1; python_version < '3.0'
pyyaml==6.0; python_version > '3.0'
redis==3.5.3; python_version < '3.0'
redis==4.5.4; python_version > '3.0'
redis==4.6.0; python_version > '3.0'
requests-kerberos==0.12.0; python_version < '3.0'
requests-kerberos==0.14.0; python_version > '3.0'
requests-ntlm==1.1.0
requests-ntlm==1.1.0; python_version < '3.0'
requests-ntlm==1.2.0; python_version > '3.0'
requests-oauthlib==1.3.1
requests-toolbelt==1.0.0
requests-unixsocket==0.3.0
Expand All @@ -94,17 +95,19 @@ rethinkdb==2.4.9
scandir==1.10.0
securesystemslib[crypto,pynacl]==0.25.0; python_version > '3.0'
selectors34==1.2; sys_platform == 'win32' and python_version < '3.0'
semver==2.13.0
semver==2.13.0; python_version < '3.0'
semver==3.0.1; python_version > '3.0'
serpent==1.28; sys_platform == 'win32' and python_version < '3.0'
serpent==1.41; sys_platform == 'win32' and python_version > '3.0'
service-identity[idna]==21.1.0
simplejson==3.17.6
simplejson==3.19.1
six==1.16.0
snowflake-connector-python==3.0.4; python_version > '3.0'
supervisor==4.2.5
tuf==2.0.0; python_version > '3.0'
typing==3.10.0.0; python_version < '3.0'
uptime==3.0.1
vertica-python==1.1.1
vertica-python==1.2.0; python_version < '3.0'
vertica-python==1.3.2; python_version > '3.0'
win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0'
wrapt==1.14.1
wrapt==1.15.0
20 changes: 10 additions & 10 deletions datadog_checks_base/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ classifiers = [
dynamic = [
"version",
]

license = "BSD-3-Clause"

[project.optional-dependencies]
Expand All @@ -41,7 +40,7 @@ db = [
deps = [
"binary==1.0.0",
"cachetools==3.1.1; python_version < '3.0'",
"cachetools==5.3.0; python_version > '3.0'",
"cachetools==5.3.1; python_version > '3.0'",
"contextlib2==0.6.0.post1; python_version < '3.0'",
"cryptography==3.3.2; python_version < '3.0'",
"cryptography==39.0.1; python_version > '3.0'",
Expand All @@ -51,44 +50,45 @@ deps = [
"immutables==0.19; python_version > '3.0'",
"importlib-metadata==2.1.3; python_version < '3.8'",
"ipaddress==1.0.23; python_version < '3.0'",
"jellyfish==0.11.2; python_version > '3.0'",
"jellyfish==1.0.0; python_version > '3.0'",
"prometheus-client==0.12.0; python_version < '3.0'",
"prometheus-client==0.16.0; python_version > '3.0'",
"prometheus-client==0.17.0; python_version > '3.0'",
"protobuf==3.17.3; python_version < '3.0'",
"protobuf==3.20.2; python_version > '3.0'",
"pydantic==1.10.8; python_version > '3.0'",
"python-dateutil==2.8.2",
"pywin32==228; sys_platform == 'win32' and python_version < '3.0'",
"pywin32==304; sys_platform == 'win32' and python_version > '3.0'",
"pywin32==306; sys_platform == 'win32' and python_version > '3.0'",
"pyyaml==5.4.1; python_version < '3.0'",
"pyyaml==6.0; python_version > '3.0'",
"requests-toolbelt==1.0.0",
"requests-unixsocket==0.3.0",
"requests==2.27.1; python_version < '3.0'",
"requests==2.31.0; python_version > '3.0'",
"simplejson==3.17.6",
"simplejson==3.19.1",
"six==1.16.0",
"typing==3.10.0.0; python_version < '3.0'",
"uptime==3.0.1",
"wrapt==1.14.1",
"wrapt==1.15.0",
]
http = [
"aws-requests-auth==0.4.3",
"botocore==1.20.112; python_version < '3.0'",
"botocore==1.29.138; python_version > '3.0'",
"botocore==1.30.0; python_version > '3.0'",
"oauthlib==3.1.0; python_version < '3.0'",
"oauthlib==3.2.2; python_version > '3.0'",
"pyjwt==1.7.1; python_version < '3.0'",
"pyjwt==2.7.0; python_version > '3.0'",
"pysocks==1.7.1",
"requests-kerberos==0.12.0; python_version < '3.0'",
"requests-kerberos==0.14.0; python_version > '3.0'",
"requests-ntlm==1.1.0",
"requests-ntlm==1.1.0; python_version < '3.0'",
"requests-ntlm==1.2.0; python_version > '3.0'",
"requests-oauthlib==1.3.1",
"win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0'",
]
json = [
"orjson==3.8.12; python_version > '3.0'",
"orjson==3.9.1; python_version > '3.0'",
]
kube = [
"kubernetes==18.20.0; python_version < '3.0'",
Expand Down
2 changes: 1 addition & 1 deletion dotnetclr/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dynamic = [
[project.optional-dependencies]
deps = [
"pywin32==228; sys_platform == 'win32' and python_version < '3.0'",
"pywin32==304; sys_platform == 'win32' and python_version > '3.0'",
"pywin32==306; sys_platform == 'win32' and python_version > '3.0'",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion exchange_server/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dynamic = [
[project.optional-dependencies]
deps = [
"pywin32==228; sys_platform == 'win32' and python_version < '3.0'",
"pywin32==304; sys_platform == 'win32' and python_version > '3.0'",
"pywin32==306; sys_platform == 'win32' and python_version > '3.0'",
]

[project.urls]
Expand Down
1 change: 0 additions & 1 deletion gitlab/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ dependencies = [
dynamic = [
"version",
]

license = "BSD-3-Clause"

[project.optional-dependencies]
Expand Down
1 change: 0 additions & 1 deletion gitlab_runner/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ dependencies = [
dynamic = [
"version",
]

license = "BSD-3-Clause"

[project.optional-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions http_check/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ dependencies = [
dynamic = [
"version",
]

license = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"cryptography==3.3.2; python_version < '3.0'",
"cryptography==39.0.1; python_version > '3.0'",
"requests-ntlm==1.1.0",
"requests-ntlm==1.1.0; python_version < '3.0'",
"requests-ntlm==1.2.0; python_version > '3.0'",
]

[project.urls]
Expand Down
3 changes: 1 addition & 2 deletions ibm_ace/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,11 @@ dependencies = [
dynamic = [
"version",
]

license = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"pymqi==1.12.8; sys_platform != 'darwin' or platform_machine != 'arm64'",
"pymqi==1.12.10; sys_platform != 'darwin' or platform_machine != 'arm64'",
]

[project.urls]
Expand Down
3 changes: 1 addition & 2 deletions ibm_mq/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,12 @@ dependencies = [
dynamic = [
"version",
]

license = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"psutil==5.9.0",
"pymqi==1.12.8; sys_platform != 'darwin' or platform_machine != 'arm64'",
"pymqi==1.12.10; sys_platform != 'darwin' or platform_machine != 'arm64'",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion iis/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dynamic = [
[project.optional-dependencies]
deps = [
"pywin32==228; sys_platform == 'win32' and python_version < '3.0'",
"pywin32==304; sys_platform == 'win32' and python_version > '3.0'",
"pywin32==306; sys_platform == 'win32' and python_version > '3.0'",
]

[project.urls]
Expand Down
1 change: 0 additions & 1 deletion kube_dns/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ dependencies = [
dynamic = [
"version",
]

license = "BSD-3-Clause"

[project.optional-dependencies]
Expand Down
1 change: 0 additions & 1 deletion kubernetes_state/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ dependencies = [
dynamic = [
"version",
]

license = "BSD-3-Clause"

[project.optional-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion mcache/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dynamic = [
[project.optional-dependencies]
deps = [
"python-binary-memcached==0.26.1; sys_platform != 'win32' and python_version < '3.0'",
"python-binary-memcached==0.31.1; sys_platform != 'win32' and python_version > '3.0'",
"python-binary-memcached==0.31.2; sys_platform != 'win32' and python_version > '3.0'",
]

[project.urls]
Expand Down
1 change: 0 additions & 1 deletion mongo/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ dependencies = [
dynamic = [
"version",
]

license = "BSD-3-Clause"

[project.optional-dependencies]
Expand Down
3 changes: 1 addition & 2 deletions mysql/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,12 @@ dependencies = [
dynamic = [
"version",
]

license = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"cachetools==3.1.1; python_version < '3.0'",
"cachetools==5.3.0; python_version > '3.0'",
"cachetools==5.3.1; python_version > '3.0'",
"cryptography==3.3.2; python_version < '3.0'",
"cryptography==39.0.1; python_version > '3.0'",
"futures==3.4.0; python_version < '3.0'",
Expand Down
5 changes: 2 additions & 3 deletions oracle/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,16 @@ dependencies = [
dynamic = [
"version",
]

license = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"jaydebeapi==1.2.3",
"jpype1==1.4.1; python_version > '3.0'",
"oracledb==1.3.1; python_version >= '3.8'",
"oracledb==1.3.2; python_version >= '3.8'",
]
client-only = [
"oracledb==1.3.1; python_version >= '3.8'",
"oracledb==1.3.2; python_version >= '3.8'",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion pdh_check/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dynamic = [
[project.optional-dependencies]
deps = [
"pywin32==228; sys_platform == 'win32' and python_version < '3.0'",
"pywin32==304; sys_platform == 'win32' and python_version > '3.0'",
"pywin32==306; sys_platform == 'win32' and python_version > '3.0'",
]

[project.urls]
Expand Down
Loading