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 #13478

Merged
merged 4 commits into from
Dec 9, 2022
Merged

Update dependencies #13478

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
b8dc9f1
Update dependencies
iliakur Dec 8, 2022
a850818
update licenses
FlorentClarret Dec 8, 2022
0fff9e5
pin and ignore keystoneauth1
iliakur Dec 9, 2022
cd17565
pin aerospike
iliakur Dec 9, 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
6 changes: 3 additions & 3 deletions LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ oracledb,PyPI,Apache-2.0,Anthony Tuininga
oracledb,PyPI,UPL,Anthony Tuininga
orjson,PyPI,Apache-2.0,ijl <[email protected]>
orjson,PyPI,MIT,ijl <[email protected]>
packaging,PyPI,Apache-2.0,Donald Stufft and individual contributors
packaging,PyPI,BSD-2-Clause,Donald Stufft and individual contributors
packaging,PyPI,BSD-3-Clause,Donald Stufft and individual contributors
packaging,PyPI,Apache-2.0,Donald Stufft <[email protected]> | Donald Stufft and individual contributors
packaging,PyPI,BSD-2-Clause,Donald Stufft <[email protected]> | Donald Stufft and individual contributors
packaging,PyPI,BSD-3-Clause,Donald Stufft <[email protected]> | Donald Stufft and individual contributors
paramiko,PyPI,LGPL-2.1-only,Jeff Forcier
ply,PyPI,BSD-3-Clause,David Beazley
prometheus-client,PyPI,Apache-2.0,Brian Brazil
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 @@ -41,7 +41,7 @@ text = "BSD-3-Clause"
[project.optional-dependencies]
deps = [
"boto3==1.17.112; python_version < '3.0'",
"boto3==1.25.1; python_version > '3.0'",
"boto3==1.26.25; python_version > '3.0'",
]

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

[project.optional-dependencies]
deps = [
"clickhouse-cityhash==1.0.2.3",
"clickhouse-cityhash==1.0.2.3; python_version < '3.0'",
"clickhouse-cityhash==1.0.2.4; python_version > '3.0'",
Comment on lines +43 to +44
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure why we do not have the same version for py2 and py3, 1.0.2.4 seems to support py2 https://github.com/xzkostyan/clickhouse-cityhash/blob/master/setup.py#L91. Any ideas?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Since this is not a blocker and there's time pressure, ignoring it for now :(

"clickhouse-driver==0.2.0; python_version < '3.0'",
"clickhouse-driver==0.2.3; python_version > '3.0'",
"lz4==2.2.1; python_version < '3.0'",
Expand Down
17 changes: 9 additions & 8 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 @@ -6,13 +6,14 @@ beautifulsoup4==4.11.1; 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.25.1; python_version > '3.0'
boto3==1.26.25; python_version > '3.0'
boto==2.49.0
botocore==1.20.112; python_version < '3.0'
botocore==1.28.1; python_version > '3.0'
botocore==1.29.25; python_version > '3.0'
cachetools==3.1.1; python_version < '3.0'
cachetools==5.2.0; python_version > '3.0'
clickhouse-cityhash==1.0.2.3
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'
clickhouse-driver==0.2.3; python_version > '3.0'
contextlib2==0.6.0.post1; python_version < '3.0'
Expand All @@ -23,7 +24,7 @@ ddtrace==0.53.2; sys_platform != 'win32' or python_version > '3.0'
dnspython==1.16.0
enum34==1.1.10; python_version < '3.0'
foundationdb==6.3.24; python_version > '3.0'
futures==3.3.0; python_version < '3.0'
futures==3.4.0; python_version < '3.0'
gearman==2.0.2; sys_platform != 'win32' and python_version < '3.0'
gssapi==1.6.1; python_version < '3.0'
gssapi==1.8.2; python_version > '3.0'
Expand All @@ -32,7 +33,7 @@ in-toto==1.0.1
ipaddress==1.0.23; python_version < '3.0'
jaydebeapi==1.2.3
jellyfish==0.9.0; python_version > '3.0'
jpype1==1.4.0; python_version > '3.0'
jpype1==1.4.1; python_version > '3.0'
kafka-python==2.0.2
kazoo==2.9.0
keystoneauth1==5.0.0; python_version < '3.0'
FlorentClarret marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -48,10 +49,10 @@ oauthlib==3.1.0; python_version < '3.0'
oauthlib==3.2.2; python_version > '3.0'
openstacksdk==0.39.0; python_version < '3.0'
openstacksdk==0.61.0; python_version > '3.0'
oracledb==1.2.0; python_version >= '3.8'
orjson==3.8.1; python_version > '3.0'
oracledb==1.2.1; python_version >= '3.8'
orjson==3.8.3; python_version > '3.0'
packaging==20.9; python_version < '3.0'
packaging==21.3; python_version > '3.0'
packaging==22.0; python_version > '3.0'
paramiko==2.11.0
ply==3.11
prometheus-client==0.12.0; python_version < '3.0'
Expand Down
4 changes: 2 additions & 2 deletions datadog_checks_base/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ deps = [
http = [
"aws-requests-auth==0.4.3",
"botocore==1.20.112; python_version < '3.0'",
"botocore==1.28.1; python_version > '3.0'",
"botocore==1.29.25; 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'",
Expand All @@ -88,7 +88,7 @@ http = [
"win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0'",
]
json = [
"orjson==3.8.1; python_version > '3.0'",
"orjson==3.8.3; python_version > '3.0'",
]
kube = [
"kubernetes==18.20.0; python_version < '3.0'",
Expand Down
2 changes: 2 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 @@ -47,6 +47,8 @@
'lz4', # Breaking clickhouse tests
'pyodbc', # Breaking sqlserver tests
'psutil', # Breaking disk tests
'keystoneauth1', # Running our update command actually downgrades this 5.0.0 -> 3.18.0.
'aerospike', # v8+ breaks agent build.
}

# Dependencies for the downloader that are security-related and should be updated separately from the others
Expand Down
6 changes: 4 additions & 2 deletions datadog_checks_downloader/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ build-backend = "hatchling.build"
name = "datadog-checks-downloader"
description = "The Datadog Checks Downloader"
readme = "README.md"
license = {text = "BSD-3-Clause"}
keywords = [
"datadog",
"datadog agent",
Expand All @@ -32,11 +31,14 @@ dynamic = [
"version",
]

[project.license]
text = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"in-toto==1.0.1",
"packaging==20.9; python_version < '3.0'",
"packaging==21.3; python_version > '3.0'",
"packaging==22.0; python_version > '3.0'",
"securesystemslib[crypto,pynacl]==0.20.1",
"tuf==0.17.0; python_version < '3.0'",
"tuf==0.19.0; python_version > '3.0'",
Expand Down
2 changes: 1 addition & 1 deletion mysql/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ deps = [
"cachetools==5.2.0; python_version > '3.0'",
"cryptography==3.3.2; python_version < '3.0'",
"cryptography==38.0.3; python_version > '3.0'",
"futures==3.3.0; python_version < '3.0'",
"futures==3.4.0; python_version < '3.0'",
"pymysql==0.10.1",
]

Expand Down
2 changes: 1 addition & 1 deletion openstack_controller/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ text = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"openstacksdk==0.39.0; python_version < '3.0'",
"keystoneauth1==5.0.0; python_version < '3.0'",
"openstacksdk==0.39.0; python_version < '3.0'",
"openstacksdk==0.61.0; python_version > '3.0'",
]

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 @@ -40,9 +40,9 @@ text = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"oracledb==1.2.0; python_version >= '3.8'",
"jaydebeapi==1.2.3",
"jpype1==1.4.0; python_version > '3.0'",
"jpype1==1.4.1; python_version > '3.0'",
"oracledb==1.2.1; python_version >= '3.8'",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion postgres/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"
deps = [
"cachetools==3.1.1; python_version < '3.0'",
"cachetools==5.2.0; python_version > '3.0'",
"futures==3.3.0; python_version < '3.0'",
"futures==3.4.0; python_version < '3.0'",
"psycopg2-binary==2.8.6; sys_platform != 'darwin' or platform_machine != 'arm64'",
"semver==2.13.0",
]
Expand Down
2 changes: 1 addition & 1 deletion snmp/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ text = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"futures==3.3.0; python_version < '3.0'",
"futures==3.4.0; python_version < '3.0'",
"ipaddress==1.0.23; python_version < '3.0'",
"ply==3.11",
"pyasn1==0.4.6",
Expand Down
6 changes: 4 additions & 2 deletions vsphere/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ build-backend = "hatchling.build"
name = "datadog-vsphere"
description = "The vSphere check"
readme = "README.md"
license = {text = "BSD-3-Clause"}
keywords = [
"datadog",
"datadog agent",
Expand All @@ -36,9 +35,12 @@ dynamic = [
"version",
]

[project.license]
text = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"futures==3.3.0; python_version < '3.0'",
"futures==3.4.0; python_version < '3.0'",
"pyvmomi==7.0.3",
]

Expand Down