From b8dc9f175b185ea9aff68c286f77793976850559 Mon Sep 17 00:00:00 2001 From: Ilia Kurenkov Date: Thu, 8 Dec 2022 14:12:51 +0100 Subject: [PATCH 1/4] Update dependencies --- aerospike/pyproject.toml | 2 +- amazon_msk/pyproject.toml | 2 +- clickhouse/pyproject.toml | 3 ++- .../base/data/agent_requirements.in | 21 ++++++++++--------- datadog_checks_base/pyproject.toml | 4 ++-- datadog_checks_downloader/pyproject.toml | 6 ++++-- mysql/pyproject.toml | 2 +- openstack_controller/pyproject.toml | 2 +- oracle/pyproject.toml | 4 ++-- postgres/pyproject.toml | 2 +- snmp/pyproject.toml | 2 +- vsphere/pyproject.toml | 6 ++++-- 12 files changed, 31 insertions(+), 25 deletions(-) diff --git a/aerospike/pyproject.toml b/aerospike/pyproject.toml index 7dc5745edac72..6b55bff86f140 100644 --- a/aerospike/pyproject.toml +++ b/aerospike/pyproject.toml @@ -41,7 +41,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ "aerospike==4.0.0; sys_platform != 'win32' and sys_platform != 'darwin' and python_version < '3.0'", - "aerospike==7.1.1; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0'", + "aerospike==8.0.0; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0'", ] [project.urls] diff --git a/amazon_msk/pyproject.toml b/amazon_msk/pyproject.toml index 60f2544c38447..d23fe47d23177 100644 --- a/amazon_msk/pyproject.toml +++ b/amazon_msk/pyproject.toml @@ -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] diff --git a/clickhouse/pyproject.toml b/clickhouse/pyproject.toml index b9e02fea458c9..658179ad101e4 100644 --- a/clickhouse/pyproject.toml +++ b/clickhouse/pyproject.toml @@ -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'", "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'", diff --git a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in index 66617c17ff46b..1a02d065df354 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -1,18 +1,19 @@ 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==7.1.1; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0' +aerospike==8.0.0; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0' aws-requests-auth==0.4.3 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' @@ -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' @@ -32,10 +33,10 @@ 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' +keystoneauth1==3.18.0; python_version < '3.0' kubernetes==18.20.0; python_version < '3.0' kubernetes==25.3.0; python_version > '3.0' ldap3==2.9.1 @@ -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' diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index 36291e9b8a8bf..f091c785bfc00 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -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'", @@ -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'", diff --git a/datadog_checks_downloader/pyproject.toml b/datadog_checks_downloader/pyproject.toml index 9e58dacf8451d..fb22231b92e44 100644 --- a/datadog_checks_downloader/pyproject.toml +++ b/datadog_checks_downloader/pyproject.toml @@ -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", @@ -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'", diff --git a/mysql/pyproject.toml b/mysql/pyproject.toml index bcc13e7299793..aa8a9b3f0336b 100644 --- a/mysql/pyproject.toml +++ b/mysql/pyproject.toml @@ -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", ] diff --git a/openstack_controller/pyproject.toml b/openstack_controller/pyproject.toml index 6ab9988bd19d0..c3fcdde45b023 100644 --- a/openstack_controller/pyproject.toml +++ b/openstack_controller/pyproject.toml @@ -40,8 +40,8 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ + "keystoneauth1==3.18.0; python_version < '3.0'", "openstacksdk==0.39.0; python_version < '3.0'", - "keystoneauth1==5.0.0; python_version < '3.0'", "openstacksdk==0.61.0; python_version > '3.0'", ] diff --git a/oracle/pyproject.toml b/oracle/pyproject.toml index c8d0ed81cff69..bcff49948ae01 100644 --- a/oracle/pyproject.toml +++ b/oracle/pyproject.toml @@ -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] diff --git a/postgres/pyproject.toml b/postgres/pyproject.toml index 4a8e9e1a440ea..8ec207c699d51 100644 --- a/postgres/pyproject.toml +++ b/postgres/pyproject.toml @@ -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", ] diff --git a/snmp/pyproject.toml b/snmp/pyproject.toml index df3d41906b56c..20243f5f01377 100644 --- a/snmp/pyproject.toml +++ b/snmp/pyproject.toml @@ -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", diff --git a/vsphere/pyproject.toml b/vsphere/pyproject.toml index 149f4f71fcbc5..8ec1695bbebf7 100644 --- a/vsphere/pyproject.toml +++ b/vsphere/pyproject.toml @@ -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", @@ -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", ] From a8508180c2aa920c1f02092ec0db1aec9c35c8c2 Mon Sep 17 00:00:00 2001 From: Florent Clarret Date: Thu, 8 Dec 2022 16:20:40 +0100 Subject: [PATCH 2/4] update licenses --- LICENSE-3rdparty.csv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index dd22dc63db96a..482f26972b594 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -7,7 +7,7 @@ PySocks,PyPI,BSD-3-Clause,Anorov PyYAML,PyPI,MIT,Kirill Simonov Pyro4,PyPI,MIT,Irmen de Jong adodbapi,PyPI,LGPL-2.1-only,"Henrik Ekelund, Vernon Cole, et.al." -aerospike,PyPI,Apache-2.0,"Aerospike, Inc." +aerospike,PyPI,Apache-2.0,""Aerospike, Inc." | Aerospike, Inc." aws-requests-auth,PyPI,BSD-3-Clause,David Muller beautifulsoup4,PyPI,MIT,Leonard Richardson binary,PyPI,Apache-2.0,Ofek Lev @@ -49,9 +49,9 @@ oracledb,PyPI,Apache-2.0,Anthony Tuininga oracledb,PyPI,UPL,Anthony Tuininga orjson,PyPI,Apache-2.0,ijl orjson,PyPI,MIT,ijl -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 | Donald Stufft and individual contributors +packaging,PyPI,BSD-2-Clause,Donald Stufft | Donald Stufft and individual contributors +packaging,PyPI,BSD-3-Clause,Donald Stufft | 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 From 0fff9e54ab877628711ab1acc8ccbe4d619d51db Mon Sep 17 00:00:00 2001 From: Ilia Kurenkov Date: Fri, 9 Dec 2022 09:59:19 +0100 Subject: [PATCH 3/4] pin and ignore keystoneauth1 --- .../datadog_checks/base/data/agent_requirements.in | 2 +- datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py | 1 + openstack_controller/pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in index 1a02d065df354..50a79980e3311 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -36,7 +36,7 @@ jellyfish==0.9.0; python_version > '3.0' jpype1==1.4.1; python_version > '3.0' kafka-python==2.0.2 kazoo==2.9.0 -keystoneauth1==3.18.0; python_version < '3.0' +keystoneauth1==5.0.0; python_version < '3.0' kubernetes==18.20.0; python_version < '3.0' kubernetes==25.3.0; python_version > '3.0' ldap3==2.9.1 diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py index 20ed30675ce02..9eb9af436206a 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py @@ -47,6 +47,7 @@ '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. } # Dependencies for the downloader that are security-related and should be updated separately from the others diff --git a/openstack_controller/pyproject.toml b/openstack_controller/pyproject.toml index c3fcdde45b023..0f857446b5c11 100644 --- a/openstack_controller/pyproject.toml +++ b/openstack_controller/pyproject.toml @@ -40,7 +40,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "keystoneauth1==3.18.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'", ] From cd17565eabbf951906f85809288ebd6ee6bf1284 Mon Sep 17 00:00:00 2001 From: Ilia Kurenkov Date: Fri, 9 Dec 2022 10:55:21 +0100 Subject: [PATCH 4/4] pin aerospike --- LICENSE-3rdparty.csv | 2 +- aerospike/pyproject.toml | 2 +- .../datadog_checks/base/data/agent_requirements.in | 2 +- datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 482f26972b594..c59903a15d1ee 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -7,7 +7,7 @@ PySocks,PyPI,BSD-3-Clause,Anorov PyYAML,PyPI,MIT,Kirill Simonov Pyro4,PyPI,MIT,Irmen de Jong adodbapi,PyPI,LGPL-2.1-only,"Henrik Ekelund, Vernon Cole, et.al." -aerospike,PyPI,Apache-2.0,""Aerospike, Inc." | Aerospike, Inc." +aerospike,PyPI,Apache-2.0,"Aerospike, Inc." aws-requests-auth,PyPI,BSD-3-Clause,David Muller beautifulsoup4,PyPI,MIT,Leonard Richardson binary,PyPI,Apache-2.0,Ofek Lev diff --git a/aerospike/pyproject.toml b/aerospike/pyproject.toml index 6b55bff86f140..7dc5745edac72 100644 --- a/aerospike/pyproject.toml +++ b/aerospike/pyproject.toml @@ -41,7 +41,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ "aerospike==4.0.0; sys_platform != 'win32' and sys_platform != 'darwin' and python_version < '3.0'", - "aerospike==8.0.0; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0'", + "aerospike==7.1.1; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0'", ] [project.urls] diff --git a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in index 50a79980e3311..69019d6483431 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -1,6 +1,6 @@ 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==8.0.0; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0' +aerospike==7.1.1; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0' aws-requests-auth==0.4.3 beautifulsoup4==4.11.1; python_version > '3.0' beautifulsoup4==4.9.3; python_version < '3.0' diff --git a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py index 9eb9af436206a..1b434cb77821b 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py @@ -48,6 +48,7 @@ '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