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

Update dependencies #14594

Merged
merged 4 commits into from
May 26, 2023
Merged

Update dependencies #14594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
673ec0d
Update dependencies
alopezz May 24, 2023
5612c3b
Update 3rd party licenses
alopezz May 24, 2023
b78f29c
Update pydantic further
alopezz May 25, 2023
086f2e8
Update pydantic in hatch environment collector too
alopezz May 25, 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
5 changes: 3 additions & 2 deletions LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@ kubernetes,PyPI,Apache-2.0,Copyright 2014 The Kubernetes Authors.
ldap3,PyPI,LGPL-3.0-only,Copyright 2013 - 2020 Giovanni Cannata
lxml,PyPI,BSD-3-Clause,Copyright (c) 2004 Infrae. All rights reserved.
lz4,PyPI,BSD-3-Clause,"Copyright (c) 2012-2013, Steeve Morin"
mmh3,PyPI,CC0-1.0,Copyright (c) 2011-2023 Hajime Senuma
mmh3,PyPI,CC0-1.0,Hajime Senuma. mmh3 is dedicated to the public domain under CC0-1.0.
oauthlib,PyPI,BSD-3-Clause,Copyright (c) 2019 The OAuthlib Community
openstacksdk,PyPI,Apache-2.0,Copyright OpenStack
oracledb,PyPI,Apache-2.0,"Copyright (c) 2016, 2022 Oracle and/or its affiliates."
oracledb,PyPI,Apache-2.0,"Copyright (c) 2016, 2023 Oracle and/or its affiliates."
orjson,PyPI,Apache-2.0,Copyright 2018 ijl <[email protected]>
orjson,PyPI,MIT,Copyright (c) 2018 ijl <[email protected]>
packaging,PyPI,Apache-2.0,Copyright (c) Donald Stufft and individual contributors.
Expand All @@ -59,7 +60,7 @@ ply,PyPI,BSD-3-Clause,Copyright (C) 2001-2018
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
2 changes: 1 addition & 1 deletion amazon_msk/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ text = "BSD-3-Clause"
[project.optional-dependencies]
deps = [
"boto3==1.17.112; python_version < '3.0'",
"boto3==1.26.111; python_version > '3.0'",
"boto3==1.26.138; python_version > '3.0'",
]

[project.urls]
Expand Down
18 changes: 9 additions & 9 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,10 +5,10 @@ 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.111; python_version > '3.0'
boto3==1.26.138; python_version > '3.0'
boto==2.49.0
botocore==1.20.112; python_version < '3.0'
botocore==1.29.111; python_version > '3.0'
botocore==1.29.138; python_version > '3.0'
cachetools==3.1.1; python_version < '3.0'
cachetools==5.3.0; python_version > '3.0'
clickhouse-cityhash==1.0.2.3; python_version < '3.0'
Expand Down Expand Up @@ -41,27 +41,27 @@ lxml==4.9.2
lz4==2.2.1; python_version < '3.0'
lz4==3.1.3; python_version > '3.0'
mmh3==2.5.1; python_version < '3.0'
mmh3==3.1.0; python_version > '3.0'
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.0; python_version >= '3.8'
orjson==3.8.10; python_version > '3.0'
packaging==23.0; python_version > '3.0'
oracledb==1.3.1; python_version >= '3.8'
orjson==3.8.12; 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'
ply==3.11
prometheus-client==0.12.0; python_version < '3.0'
prometheus-client==0.16.0; python_version > '3.0'
protobuf==3.17.3; python_version < '3.0'
protobuf==3.20.2; python_version > '3.0'
protobuf==4.23.1; python_version > '3.0'
psutil==5.9.0
psycopg2-binary==2.8.6; sys_platform != 'darwin' or platform_machine != 'arm64'
pyasn1==0.4.6
pycryptodomex==3.10.1
pydantic==1.10.4; python_version > '3.0'
pydantic==1.10.8; python_version > '3.0'
pyjwt==1.7.1; python_version < '3.0'
pyjwt==2.6.0; 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'
pymysql==0.10.1
Expand Down
12 changes: 6 additions & 6 deletions datadog_checks_base/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ text = "BSD-3-Clause"
[project.optional-dependencies]
db = [
"mmh3==2.5.1; python_version < '3.0'",
"mmh3==3.1.0; python_version > '3.0'",
"mmh3==4.0.0; python_version > '3.0'",
]
deps = [
"binary==1.0.0",
Expand All @@ -56,8 +56,8 @@ deps = [
"prometheus-client==0.12.0; python_version < '3.0'",
"prometheus-client==0.16.0; python_version > '3.0'",
"protobuf==3.17.3; python_version < '3.0'",
"protobuf==3.20.2; python_version > '3.0'",
"pydantic==1.10.4; python_version > '3.0'",
"protobuf==4.23.1; python_version > '3.0'",
Copy link
Contributor

Choose a reason for hiding this comment

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

This one I think I had an issue with last time I tried bumping back in 7.42.x

"pydantic==1.10.8; python_version > '3.0'",
Copy link
Member

@FlorentClarret FlorentClarret May 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Could you also update the version here?

https://github.com/DataDog/integrations-core/blob/master/datadog_checks_dev/datadog_checks/dev/plugin/hatch/environment_collector.py#L122C1-L123

Copy link
Contributor Author

Choose a reason for hiding this comment

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

wow good catch

"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'",
Expand All @@ -76,11 +76,11 @@ deps = [
http = [
"aws-requests-auth==0.4.3",
"botocore==1.20.112; python_version < '3.0'",
"botocore==1.29.111; python_version > '3.0'",
"botocore==1.29.138; 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.6.0; 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'",
Expand All @@ -89,7 +89,7 @@ http = [
"win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0'",
]
json = [
"orjson==3.8.10; python_version > '3.0'",
"orjson==3.8.12; python_version > '3.0'",
]
kube = [
"kubernetes==18.20.0; python_version < '3.0'",
Expand Down
2 changes: 1 addition & 1 deletion datadog_checks_dev/datadog_checks/dev/plugin/hatch/environment_collector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def get_initial_config(self):
'black==22.12.0',
'ruff==0.0.257',
# Keep in sync with: /datadog_checks_base/pyproject.toml
'pydantic==1.10.4',
'pydantic==1.10.8',
],
}
config = {'lint': lint_env}
Expand Down
2 changes: 1 addition & 1 deletion datadog_checks_downloader/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ text = "BSD-3-Clause"
[project.optional-dependencies]
deps = [
"in-toto==1.0.1; python_version > '3.0'",
"packaging==23.0; python_version > '3.0'",
"packaging==23.1; python_version > '3.0'",
"securesystemslib[crypto,pynacl]==0.25.0; python_version > '3.0'",
"tuf==2.0.0; python_version > '3.0'",
]
Expand Down
2 changes: 1 addition & 1 deletion gitlab/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ text = "BSD-3-Clause"
[project.optional-dependencies]
deps = [
"protobuf==3.17.3; python_version < '3.0'",
"protobuf==3.20.2; python_version > '3.0'",
"protobuf==4.23.1; python_version > '3.0'",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion gitlab_runner/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ text = "BSD-3-Clause"
[project.optional-dependencies]
deps = [
"protobuf==3.17.3; python_version < '3.0'",
"protobuf==3.20.2; python_version > '3.0'",
"protobuf==4.23.1; python_version > '3.0'",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion kube_dns/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ text = "BSD-3-Clause"
[project.optional-dependencies]
deps = [
"protobuf==3.17.3; python_version < '3.0'",
"protobuf==3.20.2; python_version > '3.0'",
"protobuf==4.23.1; python_version > '3.0'",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion kubernetes_state/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ text = "BSD-3-Clause"
[project.optional-dependencies]
deps = [
"protobuf==3.17.3; python_version < '3.0'",
"protobuf==3.20.2; python_version > '3.0'",
"protobuf==4.23.1; python_version > '3.0'",
]

[project.urls]
Expand Down
4 changes: 2 additions & 2 deletions oracle/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ text = "BSD-3-Clause"
deps = [
"jaydebeapi==1.2.3",
"jpype1==1.4.1; python_version > '3.0'",
"oracledb==1.3.0; python_version >= '3.8'",
"oracledb==1.3.1; python_version >= '3.8'",
]
client-only = [
"oracledb==1.3.0; python_version >= '3.8'",
"oracledb==1.3.1; python_version >= '3.8'",
]

[project.urls]
Expand Down