From 571fe947c9c0babdffe55afff3f2ea06bb71ec73 Mon Sep 17 00:00:00 2001 From: "josemanuel.almaza" Date: Tue, 2 Aug 2022 10:25:51 +0200 Subject: [PATCH 01/33] Run 'ddev dep updates' --- aerospike/pyproject.toml | 6 +- amazon_msk/pyproject.toml | 6 +- btrfs/pyproject.toml | 6 +- clickhouse/pyproject.toml | 8 ++- .../base/data/agent_requirements.in | 66 ++++++++++--------- datadog_checks_base/pyproject.toml | 21 +++--- disk/pyproject.toml | 6 +- foundationdb/pyproject.toml | 6 +- gitlab/pyproject.toml | 8 ++- gitlab_runner/pyproject.toml | 8 ++- gunicorn/pyproject.toml | 6 +- ibm_ace/pyproject.toml | 6 +- ibm_i/pyproject.toml | 6 +- ibm_mq/pyproject.toml | 6 +- ibm_was/pyproject.toml | 6 +- kube_dns/pyproject.toml | 8 ++- kubernetes_state/pyproject.toml | 8 ++- mongo/pyproject.toml | 7 +- mysql/pyproject.toml | 6 +- network/pyproject.toml | 6 +- openstack_controller/pyproject.toml | 8 ++- oracle/pyproject.toml | 6 +- postgres/pyproject.toml | 6 +- process/pyproject.toml | 6 +- redisdb/pyproject.toml | 6 +- rethinkdb/pyproject.toml | 6 +- snmp/pyproject.toml | 10 +-- snowflake/pyproject.toml | 6 +- sqlserver/pyproject.toml | 10 +-- ssh_check/pyproject.toml | 6 +- system_core/pyproject.toml | 6 +- system_swap/pyproject.toml | 6 +- vertica/pyproject.toml | 6 +- 33 files changed, 180 insertions(+), 114 deletions(-) diff --git a/aerospike/pyproject.toml b/aerospike/pyproject.toml index eccf7b132d722..65bea238ed107 100644 --- a/aerospike/pyproject.toml +++ b/aerospike/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-aerospike" description = "The Aerospike check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,10 +34,13 @@ dynamic = [ "version", ] +[project.license] +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==6.1.2; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0'", + "aerospike==7.0.2; 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 13696d39b50c4..f6b7c6db43110 100644 --- a/amazon_msk/pyproject.toml +++ b/amazon_msk/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-amazon-msk" description = "The Amazon Kafka check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,10 +34,13 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ "boto3==1.17.112; python_version < '3.0'", - "boto3==1.22.8; python_version > '3.0'", + "boto3==1.24.43; python_version > '3.0'", ] [project.urls] diff --git a/btrfs/pyproject.toml b/btrfs/pyproject.toml index fb78021e7aabf..4cc1b550fa14d 100644 --- a/btrfs/pyproject.toml +++ b/btrfs/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-btrfs" description = "The Btrfs check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,9 +34,12 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "psutil==5.9.0", + "psutil==5.9.1", ] [project.urls] diff --git a/clickhouse/pyproject.toml b/clickhouse/pyproject.toml index 256f181a1b96b..a6ac05d500226 100644 --- a/clickhouse/pyproject.toml +++ b/clickhouse/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-clickhouse" description = "The ClickHouse check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,13 +34,16 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ "clickhouse-cityhash==1.0.2.3", "clickhouse-driver==0.2.0; python_version < '3.0'", - "clickhouse-driver==0.2.3; python_version > '3.0'", + "clickhouse-driver==0.2.4; python_version > '3.0'", "lz4==2.2.1; python_version < '3.0'", - "lz4==3.1.3; python_version > '3.0'", + "lz4==4.0.2; 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 8f3a8fa457360..e4e4afb1791be 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -1,20 +1,20 @@ 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.1.2; sys_platform != 'win32' and sys_platform != 'darwin' and python_version > '3.0' +aerospike==7.0.2; 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.22.8; python_version > '3.0' +boto3==1.24.43; python_version > '3.0' boto==2.49.0 botocore==1.20.112; python_version < '3.0' -botocore==1.25.8; python_version > '3.0' +botocore==1.27.43; python_version > '3.0' cachetools==3.1.1; python_version < '3.0' -cachetools==5.0.0; python_version > '3.0' +cachetools==5.2.0; python_version > '3.0' clickhouse-cityhash==1.0.2.3 clickhouse-driver==0.2.0; python_version < '3.0' -clickhouse-driver==0.2.3; python_version > '3.0' +clickhouse-driver==0.2.4; python_version > '3.0' contextlib2==0.6.0.post1; python_version < '3.0' cryptography==3.3.2; python_version < '3.0' cryptography==3.4.8; python_version > '3.0' @@ -24,52 +24,53 @@ ddtrace==0.32.2; sys_platform == 'win32' and python_version < '3.0' 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' +foundationdb==7.1.17; python_version > '3.0' futures==3.3.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.7.3; python_version > '3.0' -immutables==0.17; python_version > '3.0' +immutables==0.18; python_version > '3.0' 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==0.7.0; python_version < '3.0' -jpype1==1.3.0; python_version > '3.0' +jpype1==1.4.0; python_version > '3.0' kafka-python==2.0.2 kazoo==2.8.0 kubernetes==18.20.0; python_version < '3.0' -kubernetes==22.6.0; python_version > '3.0' +kubernetes==24.2.0; python_version > '3.0' ldap3==2.9.1 -lxml==4.8.0 +lxml==4.9.1 lz4==2.2.1; python_version < '3.0' -lz4==3.1.3; python_version > '3.0' +lz4==4.0.2; python_version > '3.0' mmh3==2.5.1; python_version < '3.0' mmh3==3.0.0; python_version > '3.0' -openstacksdk==0.39.0; python_version < '3.0' -openstacksdk==0.61.0; python_version > '3.0' -orjson==3.6.8; python_version > '3.0' -paramiko==2.10.4 +openstacksdk==0.100.0; python_version > '3.0' +openstacksdk==0.45.0; python_version < '3.0' +orjson==3.7.11; python_version > '3.0' +paramiko==2.11.0 ply==3.11 prometheus-client==0.12.0; python_version < '3.0' prometheus-client==0.14.1; python_version > '3.0' -protobuf==3.17.3; python_version < '3.0' -protobuf==3.20.1; python_version > '3.0' -psutil==5.9.0 +protobuf==4.21.0; python_version < '3.0' +protobuf==4.21.4; python_version > '3.0' +psutil==5.9.1 psycopg2-binary==2.8.6 -pyasn1==0.4.6 -pycryptodomex==3.10.1 -pydantic==1.9.0; python_version > '3.0' +pyasn1==0.4.8 +pycryptodomex==3.15.0 +pydantic==1.9.1; python_version > '3.0' pyjwt==1.7.1; python_version < '3.0' pyjwt==2.4.0; python_version > '3.0' -pymongo[srv]==3.12.3 -pymqi==1.12.0 +pymongo[srv]==3.12.3; python_version < '3.0' +pymongo[srv]==4.2.0; python_version > '3.0' +pymqi==1.12.8 pymysql==0.10.1 -pyodbc==4.0.32 +pyodbc==4.0.34 pyro4==4.82; sys_platform == 'win32' pysmi==0.3.4 pysnmp-mibs==0.1.6 -pysnmp==4.4.9 +pysnmp==4.4.12 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' @@ -78,9 +79,10 @@ 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' -pyyaml==5.4.1 +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.2.2; python_version > '3.0' +redis==4.3.4; 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 @@ -88,22 +90,22 @@ requests-toolbelt==0.9.1 requests-unixsocket==0.3.0 requests==2.27.1; python_version < '3.0' requests==2.28.1; python_version > '3.0' -rethinkdb==2.4.8 +rethinkdb==2.4.9 scandir==1.10.0 securesystemslib[crypto,pynacl]==0.20.1 selectors34==1.2; sys_platform == 'win32' and python_version < '3.0' semver==2.13.0 serpent==1.28; sys_platform == 'win32' and python_version < '3.0' -serpent==1.40; 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 six==1.16.0 -snowflake-connector-python==2.7.6; python_version > '3.0' +snowflake-connector-python==2.7.11; python_version > '3.0' supervisor==4.2.4 tuf==0.17.0; python_version < '3.0' tuf==0.19.0; python_version > '3.0' typing==3.10.0.0; python_version < '3.0' uptime==3.0.1 -vertica-python==1.0.5 +vertica-python==1.1.1 win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0' -wrapt==1.14.0 +wrapt==1.14.1 diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index f1cdcfcfef40c..5cadbf68c2fdf 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -41,25 +41,26 @@ db = [ deps = [ "binary==1.0.0", "cachetools==3.1.1; python_version < '3.0'", - "cachetools==5.0.0; python_version > '3.0'", + "cachetools==5.2.0; python_version > '3.0'", "contextlib2==0.6.0.post1; python_version < '3.0'", "cryptography==3.3.2; python_version < '3.0'", "cryptography==3.4.8; python_version > '3.0'", "ddtrace==0.32.2; sys_platform == 'win32' and python_version < '3.0'", "ddtrace==0.53.2; sys_platform != 'win32' or python_version > '3.0'", "enum34==1.1.10; python_version < '3.0'", - "immutables==0.17; python_version > '3.0'", + "immutables==0.18; python_version > '3.0'", "ipaddress==1.0.23; python_version < '3.0'", "jellyfish==0.9.0; python_version > '3.0'", "prometheus-client==0.12.0; python_version < '3.0'", "prometheus-client==0.14.1; python_version > '3.0'", - "protobuf==3.17.3; python_version < '3.0'", - "protobuf==3.20.1; python_version > '3.0'", - "pydantic==1.9.0; python_version > '3.0'", + "protobuf==4.21.0; python_version < '3.0'", + "protobuf==4.21.4; python_version > '3.0'", + "pydantic==1.9.1; 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'", - "pyyaml==5.4.1", + "pyyaml==5.4.1; python_version < '3.0'", + "pyyaml==6.0; python_version > '3.0'", "requests-toolbelt==0.9.1", "requests-unixsocket==0.3.0", "requests==2.27.1; python_version < '3.0'", @@ -68,12 +69,12 @@ deps = [ "six==1.16.0", "typing==3.10.0.0; python_version < '3.0'", "uptime==3.0.1", - "wrapt==1.14.0", + "wrapt==1.14.1", ] http = [ "aws-requests-auth==0.4.3", "botocore==1.20.112; python_version < '3.0'", - "botocore==1.25.8; python_version > '3.0'", + "botocore==1.27.43; python_version > '3.0'", "pyjwt==1.7.1; python_version < '3.0'", "pyjwt==2.4.0; python_version > '3.0'", "pysocks==1.7.1", @@ -83,11 +84,11 @@ http = [ "win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0'", ] json = [ - "orjson==3.6.8; python_version > '3.0'", + "orjson==3.7.11; python_version > '3.0'", ] kube = [ "kubernetes==18.20.0; python_version < '3.0'", - "kubernetes==22.6.0; python_version > '3.0'", + "kubernetes==24.2.0; python_version > '3.0'", ] [project.urls] diff --git a/disk/pyproject.toml b/disk/pyproject.toml index 85026b0a05c87..a773ef85617a1 100644 --- a/disk/pyproject.toml +++ b/disk/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-disk" description = "The Disk check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,9 +34,12 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "psutil==5.9.0", + "psutil==5.9.1", ] [project.urls] diff --git a/foundationdb/pyproject.toml b/foundationdb/pyproject.toml index 6bc71ca5501ad..a9514930f3ac3 100644 --- a/foundationdb/pyproject.toml +++ b/foundationdb/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-foundationdb" description = "The FoundationDB check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,9 +34,12 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "foundationdb==6.3.24; python_version > '3.0'", + "foundationdb==7.1.17; python_version > '3.0'", ] [project.urls] diff --git a/gitlab/pyproject.toml b/gitlab/pyproject.toml index 5895deb0be0f2..a12b63fcbffd7 100644 --- a/gitlab/pyproject.toml +++ b/gitlab/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-gitlab" description = "The Gitlab check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,10 +34,13 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "protobuf==3.17.3; python_version < '3.0'", - "protobuf==3.20.1; python_version > '3.0'", + "protobuf==4.21.0; python_version < '3.0'", + "protobuf==4.21.4; python_version > '3.0'", ] [project.urls] diff --git a/gitlab_runner/pyproject.toml b/gitlab_runner/pyproject.toml index 426254bfe4803..519663811d21f 100644 --- a/gitlab_runner/pyproject.toml +++ b/gitlab_runner/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-gitlab-runner" description = "The Gitlab Runner check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,10 +34,13 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "protobuf==3.17.3; python_version < '3.0'", - "protobuf==3.20.1; python_version > '3.0'", + "protobuf==4.21.0; python_version < '3.0'", + "protobuf==4.21.4; python_version > '3.0'", ] [project.urls] diff --git a/gunicorn/pyproject.toml b/gunicorn/pyproject.toml index 916d5e9adba27..0e257431fb86b 100644 --- a/gunicorn/pyproject.toml +++ b/gunicorn/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-gunicorn" description = "The Gunicorn check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,9 +34,12 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "psutil==5.9.0", + "psutil==5.9.1", ] [project.urls] diff --git a/ibm_ace/pyproject.toml b/ibm_ace/pyproject.toml index 8c666bc11badc..824f711a02d7a 100644 --- a/ibm_ace/pyproject.toml +++ b/ibm_ace/pyproject.toml @@ -8,7 +8,6 @@ build-backend = "hatchling.build" name = "datadog-ibm-ace" description = "The IBM ACE check" readme = "README.md" -license = {text = "BSD-3-Clause"} requires-python = ">=3.8" keywords = [ "datadog", @@ -34,9 +33,12 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "pymqi==1.12.0", + "pymqi==1.12.8", ] [project.urls] diff --git a/ibm_i/pyproject.toml b/ibm_i/pyproject.toml index 5e306f273d611..4bb00d8270170 100644 --- a/ibm_i/pyproject.toml +++ b/ibm_i/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-ibm-i" description = "The IBM i check" readme = "README.md" -license = {text = "BSD-3-Clause"} requires-python = ">=3.8" keywords = [ "datadog", @@ -35,9 +34,12 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "pyodbc==4.0.32", + "pyodbc==4.0.34", ] [project.urls] diff --git a/ibm_mq/pyproject.toml b/ibm_mq/pyproject.toml index 58b47249a9eab..679886657c756 100644 --- a/ibm_mq/pyproject.toml +++ b/ibm_mq/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-ibm-mq" description = "The IBM MQ check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,9 +34,12 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "pymqi==1.12.0", + "pymqi==1.12.8", ] [project.urls] diff --git a/ibm_was/pyproject.toml b/ibm_was/pyproject.toml index 30827e2f34d37..cbe2b8b4852ae 100644 --- a/ibm_was/pyproject.toml +++ b/ibm_was/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-ibm-was" description = "The IBM WAS check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,9 +34,12 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "lxml==4.8.0", + "lxml==4.9.1", ] [project.urls] diff --git a/kube_dns/pyproject.toml b/kube_dns/pyproject.toml index a7f807e4ac16c..27d1cf9e297be 100644 --- a/kube_dns/pyproject.toml +++ b/kube_dns/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-kube-dns" description = "The Kube DNS check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,10 +34,13 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "protobuf==3.17.3; python_version < '3.0'", - "protobuf==3.20.1; python_version > '3.0'", + "protobuf==4.21.0; python_version < '3.0'", + "protobuf==4.21.4; python_version > '3.0'", ] [project.urls] diff --git a/kubernetes_state/pyproject.toml b/kubernetes_state/pyproject.toml index c4406fdcdbdb0..4c594b4ee8298 100644 --- a/kubernetes_state/pyproject.toml +++ b/kubernetes_state/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-kubernetes-state" description = "The Kubernetes State check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,10 +34,13 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "protobuf==3.17.3; python_version < '3.0'", - "protobuf==3.20.1; python_version > '3.0'", + "protobuf==4.21.0; python_version < '3.0'", + "protobuf==4.21.4; python_version > '3.0'", ] [project.urls] diff --git a/mongo/pyproject.toml b/mongo/pyproject.toml index a829a6821f4df..f53ae7b92b448 100644 --- a/mongo/pyproject.toml +++ b/mongo/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-mongo" description = "The MongoDB check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,9 +34,13 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "pymongo[srv]==3.12.3", + "pymongo[srv]==3.12.3; python_version < '3.0'", + "pymongo[srv]==4.2.0; python_version > '3.0'", ] [project.urls] diff --git a/mysql/pyproject.toml b/mysql/pyproject.toml index c2e198ab2c20f..1bd5fa7bd60e8 100644 --- a/mysql/pyproject.toml +++ b/mysql/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-mysql" description = "The MySQL check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,10 +34,13 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ "cachetools==3.1.1; python_version < '3.0'", - "cachetools==5.0.0; python_version > '3.0'", + "cachetools==5.2.0; python_version > '3.0'", "cryptography==3.3.2; python_version < '3.0'", "cryptography==3.4.8; python_version > '3.0'", "futures==3.3.0; python_version < '3.0'", diff --git a/network/pyproject.toml b/network/pyproject.toml index dc8d8ba572b03..75a98de909674 100644 --- a/network/pyproject.toml +++ b/network/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-network" description = "The Network check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,9 +34,12 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "psutil==5.9.0", + "psutil==5.9.1", ] [project.urls] diff --git a/openstack_controller/pyproject.toml b/openstack_controller/pyproject.toml index b76829ffbd67b..f9a73c43c7310 100644 --- a/openstack_controller/pyproject.toml +++ b/openstack_controller/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-openstack-controller" description = "The Openstack_controller check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,10 +34,13 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "openstacksdk==0.39.0; python_version < '3.0'", - "openstacksdk==0.61.0; python_version > '3.0'", + "openstacksdk==0.100.0; python_version > '3.0'", + "openstacksdk==0.45.0; python_version < '3.0'", ] [project.urls] diff --git a/oracle/pyproject.toml b/oracle/pyproject.toml index 5deb26e969a6d..3f67069b852c9 100644 --- a/oracle/pyproject.toml +++ b/oracle/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-oracle" description = "The Oracle Database check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,13 +34,16 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ "cx-oracle==7.3.0; python_version < '3.0'", "cx-oracle==8.3.0; python_version > '3.0'", "jaydebeapi==1.2.3", "jpype1==0.7.0; python_version < '3.0'", - "jpype1==1.3.0; python_version > '3.0'", + "jpype1==1.4.0; python_version > '3.0'", ] [project.urls] diff --git a/postgres/pyproject.toml b/postgres/pyproject.toml index ce966803befea..e5233b3d43e53 100644 --- a/postgres/pyproject.toml +++ b/postgres/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-postgres" description = "The Postgres check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,10 +34,13 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ "cachetools==3.1.1; python_version < '3.0'", - "cachetools==5.0.0; python_version > '3.0'", + "cachetools==5.2.0; python_version > '3.0'", "futures==3.3.0; python_version < '3.0'", "psycopg2-binary==2.8.6", "semver==2.13.0", diff --git a/process/pyproject.toml b/process/pyproject.toml index ac68b5df3b13f..a0015382cfb50 100644 --- a/process/pyproject.toml +++ b/process/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-process" description = "The Process check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,9 +34,12 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "psutil==5.9.0", + "psutil==5.9.1", ] [project.urls] diff --git a/redisdb/pyproject.toml b/redisdb/pyproject.toml index 088ea02aff0ab..2edfb9e3b6154 100644 --- a/redisdb/pyproject.toml +++ b/redisdb/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-redisdb" description = "The Redis check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,10 +34,13 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ "redis==3.5.3; python_version < '3.0'", - "redis==4.2.2; python_version > '3.0'", + "redis==4.3.4; python_version > '3.0'", ] [project.urls] diff --git a/rethinkdb/pyproject.toml b/rethinkdb/pyproject.toml index 1513c520e711d..e722f4668c876 100644 --- a/rethinkdb/pyproject.toml +++ b/rethinkdb/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-rethinkdb" description = "The RethinkDB check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,9 +34,12 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "rethinkdb==2.4.8", + "rethinkdb==2.4.9", ] [project.urls] diff --git a/snmp/pyproject.toml b/snmp/pyproject.toml index 67db1da65faed..926dd79ded3cf 100644 --- a/snmp/pyproject.toml +++ b/snmp/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-snmp" description = "The SNMP check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,16 +34,19 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ "futures==3.3.0; python_version < '3.0'", "ipaddress==1.0.23; python_version < '3.0'", "ply==3.11", - "pyasn1==0.4.6", - "pycryptodomex==3.10.1", + "pyasn1==0.4.8", + "pycryptodomex==3.15.0", "pysmi==0.3.4", "pysnmp-mibs==0.1.6", - "pysnmp==4.4.9", + "pysnmp==4.4.12", ] [project.urls] diff --git a/snowflake/pyproject.toml b/snowflake/pyproject.toml index af5a2e1d956fd..d2d59feb1055c 100644 --- a/snowflake/pyproject.toml +++ b/snowflake/pyproject.toml @@ -8,7 +8,6 @@ build-backend = "hatchling.build" name = "datadog-snowflake" description = "The Snowflake check" readme = "README.md" -license = {text = "BSD-3-Clause"} requires-python = ">=3.8" keywords = [ "datadog", @@ -34,9 +33,12 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "snowflake-connector-python==2.7.6; python_version > '3.0'", + "snowflake-connector-python==2.7.11; python_version > '3.0'", ] [project.urls] diff --git a/sqlserver/pyproject.toml b/sqlserver/pyproject.toml index b8cbef70bbe00..8a57651a79539 100644 --- a/sqlserver/pyproject.toml +++ b/sqlserver/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-sqlserver" description = "The SQL Server check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,17 +34,20 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ "adodbapi==2.6.2.0; sys_platform == 'win32'", - "lxml==4.8.0", - "pyodbc==4.0.32", + "lxml==4.9.1", + "pyodbc==4.0.34", "pyro4==4.82; sys_platform == 'win32'", "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", "pywin32==304; sys_platform == 'win32' and python_version > '3.0'", "selectors34==1.2; sys_platform == 'win32' and python_version < '3.0'", "serpent==1.28; sys_platform == 'win32' and python_version < '3.0'", - "serpent==1.40; sys_platform == 'win32' and python_version > '3.0'", + "serpent==1.41; sys_platform == 'win32' and python_version > '3.0'", ] [project.urls] diff --git a/ssh_check/pyproject.toml b/ssh_check/pyproject.toml index 0f52cec1e314b..b349435af37b5 100644 --- a/ssh_check/pyproject.toml +++ b/ssh_check/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-ssh-check" description = "The SSH check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,9 +34,12 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "paramiko==2.10.4", + "paramiko==2.11.0", ] [project.urls] diff --git a/system_core/pyproject.toml b/system_core/pyproject.toml index 62bd6c45b70b8..1c51f9d63e06d 100644 --- a/system_core/pyproject.toml +++ b/system_core/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-system-core" description = "The System Core check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,9 +34,12 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "psutil==5.9.0", + "psutil==5.9.1", ] [project.urls] diff --git a/system_swap/pyproject.toml b/system_swap/pyproject.toml index eebd0f7bc7c65..7be1d415308e7 100644 --- a/system_swap/pyproject.toml +++ b/system_swap/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-system-swap" description = "The System Swap check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,9 +34,12 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "psutil==5.9.0", + "psutil==5.9.1", ] [project.urls] diff --git a/vertica/pyproject.toml b/vertica/pyproject.toml index 5f7bc1b5f484b..25510b7af2852 100644 --- a/vertica/pyproject.toml +++ b/vertica/pyproject.toml @@ -9,7 +9,6 @@ build-backend = "hatchling.build" name = "datadog-vertica" description = "The Vertica check" readme = "README.md" -license = {text = "BSD-3-Clause"} keywords = [ "datadog", "datadog agent", @@ -35,9 +34,12 @@ dynamic = [ "version", ] +[project.license] +text = "BSD-3-Clause" + [project.optional-dependencies] deps = [ - "vertica-python==1.0.5", + "vertica-python==1.1.1", ] [project.urls] From 6cd926635757017ff5ebdefd22884da287c2cd82 Mon Sep 17 00:00:00 2001 From: "josemanuel.almaza" Date: Tue, 2 Aug 2022 10:34:25 +0200 Subject: [PATCH 02/33] Run 'ddev validate licenses --sync' --- LICENSE-3rdparty.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 55be3603d3408..bfc3959bc81ed 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -57,8 +57,8 @@ pyasn1,PyPI,BSD-3-Clause,Ilya Etingof pycryptodomex,PyPI,BSD-2-Clause,Helder Eijs pycryptodomex,PyPI,Unlicense,Helder Eijs pydantic,PyPI,MIT,Samuel Colvin -pymongo,PyPI,Apache-2.0,Bernie Hackett -pymqi,PyPI,PSF,Dariusz Suchojad +pymongo,PyPI,Apache-2.0,Bernie Hackett | The MongoDB Python Team +pymqi,PyPI,PSF,Zato Source s.r.o. pyodbc,PyPI,MIT,Michael Kleehammer pysmi,PyPI,BSD-3-Clause,Ilya Etingof pysnmp,PyPI,BSD-3-Clause,Ilya Etingof From c9868c3667894438644b3e3914bbb8629f4868a2 Mon Sep 17 00:00:00 2001 From: "josemanuel.almaza" Date: Tue, 2 Aug 2022 13:13:34 +0200 Subject: [PATCH 03/33] Added protobuf to IGNORED_DEPS because updated dependency version fot py2 was yanked. Keeping previous version. --- .../datadog_checks/base/data/agent_requirements.in | 2 +- datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 e4e4afb1791be..a82d37f408f68 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -53,7 +53,7 @@ paramiko==2.11.0 ply==3.11 prometheus-client==0.12.0; python_version < '3.0' prometheus-client==0.14.1; python_version > '3.0' -protobuf==4.21.0; python_version < '3.0' +protobuf==3.17.3; python_version < '3.0' protobuf==4.21.4; python_version > '3.0' psutil==5.9.1 psycopg2-binary==2.8.6 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 b48962b9d0f33..e579ad83740da 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py @@ -36,6 +36,7 @@ 'cryptography', 'dnspython', 'pymysql', # https://github.com/DataDog/integrations-core/pull/12612 + 'protobuf', # https://github.com/DataDog/integrations-core/pull/12653 } # Dependencies for the downloader that are security-related and should be updated separately from the others From 1cabf87799922a8da4274722cf9951b040eb137d Mon Sep 17 00:00:00 2001 From: "josemanuel.almaza" Date: Tue, 2 Aug 2022 13:34:38 +0200 Subject: [PATCH 04/33] protobuf version 3.17.3 when python_version < '3.0' --- datadog_checks_base/pyproject.toml | 2 +- gitlab/pyproject.toml | 2 +- gitlab_runner/pyproject.toml | 2 +- kube_dns/pyproject.toml | 2 +- kubernetes_state/pyproject.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index 5cadbf68c2fdf..7e65e9fc355a3 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -53,7 +53,7 @@ deps = [ "jellyfish==0.9.0; python_version > '3.0'", "prometheus-client==0.12.0; python_version < '3.0'", "prometheus-client==0.14.1; python_version > '3.0'", - "protobuf==4.21.0; python_version < '3.0'", + "protobuf==3.17.3; python_version < '3.0'", "protobuf==4.21.4; python_version > '3.0'", "pydantic==1.9.1; python_version > '3.0'", "python-dateutil==2.8.2", diff --git a/gitlab/pyproject.toml b/gitlab/pyproject.toml index a12b63fcbffd7..305a3b3338d76 100644 --- a/gitlab/pyproject.toml +++ b/gitlab/pyproject.toml @@ -39,7 +39,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "protobuf==4.21.0; python_version < '3.0'", + "protobuf==3.17.3; python_version < '3.0'", "protobuf==4.21.4; python_version > '3.0'", ] diff --git a/gitlab_runner/pyproject.toml b/gitlab_runner/pyproject.toml index 519663811d21f..3b9334b2b3a88 100644 --- a/gitlab_runner/pyproject.toml +++ b/gitlab_runner/pyproject.toml @@ -39,7 +39,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "protobuf==4.21.0; python_version < '3.0'", + "protobuf==3.17.3; python_version < '3.0'", "protobuf==4.21.4; python_version > '3.0'", ] diff --git a/kube_dns/pyproject.toml b/kube_dns/pyproject.toml index 27d1cf9e297be..bf89c4a9d1e65 100644 --- a/kube_dns/pyproject.toml +++ b/kube_dns/pyproject.toml @@ -39,7 +39,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "protobuf==4.21.0; python_version < '3.0'", + "protobuf==3.17.3; python_version < '3.0'", "protobuf==4.21.4; python_version > '3.0'", ] diff --git a/kubernetes_state/pyproject.toml b/kubernetes_state/pyproject.toml index 4c594b4ee8298..0bbb8dba13f4a 100644 --- a/kubernetes_state/pyproject.toml +++ b/kubernetes_state/pyproject.toml @@ -39,7 +39,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "protobuf==4.21.0; python_version < '3.0'", + "protobuf==3.17.3; python_version < '3.0'", "protobuf==4.21.4; python_version > '3.0'", ] From 0414fc57dfc0548a3a28920f93f223cbe8433816 Mon Sep 17 00:00:00 2001 From: "josemanuel.almaza" Date: Tue, 2 Aug 2022 13:47:16 +0200 Subject: [PATCH 05/33] Updated pyyaml dependency --- datadog_checks_dev/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datadog_checks_dev/pyproject.toml b/datadog_checks_dev/pyproject.toml index 7e052365f9839..2e2d0e6365b4d 100644 --- a/datadog_checks_dev/pyproject.toml +++ b/datadog_checks_dev/pyproject.toml @@ -40,7 +40,7 @@ dependencies = [ "pytest-benchmark[histogram]>=3.2.1", "pytest-cov>=2.6.1", "pytest-mock", - "pyyaml==5.4.1", + "pyyaml>=5.4.1", "requests>=2.22.0", "shutilwhich==1.1.0; python_version < '3.0'", "six", From 2f530c93abd36c840d0a40805b409430a2a2dc9d Mon Sep 17 00:00:00 2001 From: "josemanuel.almaza" Date: Tue, 2 Aug 2022 17:18:04 +0200 Subject: [PATCH 06/33] Rollback to 3.20.1 protobuf version for py3 --- .../datadog_checks/base/data/agent_requirements.in | 2 +- datadog_checks_base/pyproject.toml | 2 +- gitlab/pyproject.toml | 2 +- gitlab_runner/pyproject.toml | 2 +- kube_dns/pyproject.toml | 2 +- kubernetes_state/pyproject.toml | 2 +- 6 files changed, 6 insertions(+), 6 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 a82d37f408f68..971de73272bde 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -54,7 +54,7 @@ ply==3.11 prometheus-client==0.12.0; python_version < '3.0' prometheus-client==0.14.1; python_version > '3.0' protobuf==3.17.3; python_version < '3.0' -protobuf==4.21.4; python_version > '3.0' +protobuf==3.20.1; python_version > '3.0' psutil==5.9.1 psycopg2-binary==2.8.6 pyasn1==0.4.8 diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index 7e65e9fc355a3..39fffe00c59ea 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -54,7 +54,7 @@ deps = [ "prometheus-client==0.12.0; python_version < '3.0'", "prometheus-client==0.14.1; python_version > '3.0'", "protobuf==3.17.3; python_version < '3.0'", - "protobuf==4.21.4; python_version > '3.0'", + "protobuf==3.20.1; python_version > '3.0'", "pydantic==1.9.1; python_version > '3.0'", "python-dateutil==2.8.2", "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", diff --git a/gitlab/pyproject.toml b/gitlab/pyproject.toml index 305a3b3338d76..c37429625c3b5 100644 --- a/gitlab/pyproject.toml +++ b/gitlab/pyproject.toml @@ -40,7 +40,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ "protobuf==3.17.3; python_version < '3.0'", - "protobuf==4.21.4; python_version > '3.0'", + "protobuf==3.20.1; python_version > '3.0'", ] [project.urls] diff --git a/gitlab_runner/pyproject.toml b/gitlab_runner/pyproject.toml index 3b9334b2b3a88..caeea45ee252c 100644 --- a/gitlab_runner/pyproject.toml +++ b/gitlab_runner/pyproject.toml @@ -40,7 +40,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ "protobuf==3.17.3; python_version < '3.0'", - "protobuf==4.21.4; python_version > '3.0'", + "protobuf==3.20.1; python_version > '3.0'", ] [project.urls] diff --git a/kube_dns/pyproject.toml b/kube_dns/pyproject.toml index bf89c4a9d1e65..b4f2e3f93b00a 100644 --- a/kube_dns/pyproject.toml +++ b/kube_dns/pyproject.toml @@ -40,7 +40,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ "protobuf==3.17.3; python_version < '3.0'", - "protobuf==4.21.4; python_version > '3.0'", + "protobuf==3.20.1; python_version > '3.0'", ] [project.urls] diff --git a/kubernetes_state/pyproject.toml b/kubernetes_state/pyproject.toml index 0bbb8dba13f4a..7bde730106209 100644 --- a/kubernetes_state/pyproject.toml +++ b/kubernetes_state/pyproject.toml @@ -40,7 +40,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ "protobuf==3.17.3; python_version < '3.0'", - "protobuf==4.21.4; python_version > '3.0'", + "protobuf==3.20.1; python_version > '3.0'", ] [project.urls] From 96fb4ae2abef590ecead281351498ecf76fd0fd5 Mon Sep 17 00:00:00 2001 From: "josemanuel.almaza" Date: Tue, 2 Aug 2022 17:45:58 +0200 Subject: [PATCH 07/33] Rollback foundationdb dependency to previous version --- .../datadog_checks/base/data/agent_requirements.in | 2 +- foundationdb/pyproject.toml | 2 +- 2 files changed, 2 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 971de73272bde..0ef75ecd8f89b 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -24,7 +24,7 @@ ddtrace==0.32.2; sys_platform == 'win32' and python_version < '3.0' 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==7.1.17; python_version > '3.0' +foundationdb==6.3.24; python_version > '3.0' futures==3.3.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' diff --git a/foundationdb/pyproject.toml b/foundationdb/pyproject.toml index a9514930f3ac3..11fedd59a0b66 100644 --- a/foundationdb/pyproject.toml +++ b/foundationdb/pyproject.toml @@ -39,7 +39,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "foundationdb==7.1.17; python_version > '3.0'", + "foundationdb==6.3.24; python_version > '3.0'", ] [project.urls] From b82d470b182321395705a9efc81b56fd9c3a9b7c Mon Sep 17 00:00:00 2001 From: "josemanuel.almaza" Date: Tue, 2 Aug 2022 17:55:43 +0200 Subject: [PATCH 08/33] Added foundationdb to IGNORED_DEPS --- datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py | 1 + 1 file changed, 1 insertion(+) 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 e579ad83740da..e6fc70fdd202c 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py @@ -37,6 +37,7 @@ 'dnspython', 'pymysql', # https://github.com/DataDog/integrations-core/pull/12612 'protobuf', # https://github.com/DataDog/integrations-core/pull/12653 + 'foundationdb', # https://github.com/DataDog/integrations-core/pull/12653 } # Dependencies for the downloader that are security-related and should be updated separately from the others From 9e4bd3314a979359f97a09c1d1c6e3286beb0bdb Mon Sep 17 00:00:00 2001 From: "josemanuel.almaza" Date: Tue, 2 Aug 2022 18:51:43 +0200 Subject: [PATCH 09/33] Rollback openstacksdk dependency to previous version --- .../datadog_checks/base/data/agent_requirements.in | 4 ++-- openstack_controller/pyproject.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 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 443c5b2113fe9..73feda6c4cf4f 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -46,8 +46,8 @@ lz4==2.2.1; python_version < '3.0' lz4==4.0.2; python_version > '3.0' mmh3==2.5.1; python_version < '3.0' mmh3==3.0.0; python_version > '3.0' -openstacksdk==0.100.0; python_version > '3.0' -openstacksdk==0.45.0; python_version < '3.0' +openstacksdk==0.39.0; python_version < '3.0' +openstacksdk==0.61.0; python_version > '3.0' orjson==3.7.11; python_version > '3.0' paramiko==2.11.0 ply==3.11 diff --git a/openstack_controller/pyproject.toml b/openstack_controller/pyproject.toml index f9a73c43c7310..d243605c4801d 100644 --- a/openstack_controller/pyproject.toml +++ b/openstack_controller/pyproject.toml @@ -39,8 +39,8 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "openstacksdk==0.100.0; python_version > '3.0'", - "openstacksdk==0.45.0; python_version < '3.0'", + "openstacksdk==0.39.0; python_version < '3.0'", + "openstacksdk==0.61.0; python_version > '3.0'", ] [project.urls] From 96280bb2d478c9d852baf74a7c684923c9668b46 Mon Sep 17 00:00:00 2001 From: "josemanuel.almaza" Date: Tue, 2 Aug 2022 18:54:15 +0200 Subject: [PATCH 10/33] Added openstacksdk to IGNORED_DEPS --- datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py | 1 + 1 file changed, 1 insertion(+) 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 e6fc70fdd202c..6327483c75687 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py @@ -38,6 +38,7 @@ 'pymysql', # https://github.com/DataDog/integrations-core/pull/12612 'protobuf', # https://github.com/DataDog/integrations-core/pull/12653 'foundationdb', # https://github.com/DataDog/integrations-core/pull/12653 + 'openstacksdk', # https://github.com/DataDog/integrations-core/pull/12653 } # Dependencies for the downloader that are security-related and should be updated separately from the others From f6d35b06644ecc54aa70fbb86280c289ffa14f80 Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Wed, 3 Aug 2022 08:41:23 +0200 Subject: [PATCH 11/33] Rollback snmp dependency to previous version and added to IGNORED_DEPS --- .../datadog_checks/base/data/agent_requirements.in | 6 +++--- .../datadog_checks/dev/tooling/commands/dep.py | 1 + snmp/pyproject.toml | 6 +++--- 3 files changed, 7 insertions(+), 6 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 73feda6c4cf4f..fb95d4cac8b49 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -57,8 +57,8 @@ protobuf==3.17.3; python_version < '3.0' protobuf==3.20.1; python_version > '3.0' psutil==5.9.1 psycopg2-binary==2.8.6 -pyasn1==0.4.8 -pycryptodomex==3.15.0 +pyasn1==0.4.6 +pycryptodomex==3.10.1 pydantic==1.9.1; python_version > '3.0' pyjwt==1.7.1; python_version < '3.0' pyjwt==2.4.0; python_version > '3.0' @@ -69,7 +69,7 @@ pyodbc==4.0.34 pyro4==4.82; sys_platform == 'win32' pysmi==0.3.4 pysnmp-mibs==0.1.6 -pysnmp==4.4.12 +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' 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 6327483c75687..b252166c0d812 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py @@ -39,6 +39,7 @@ 'protobuf', # https://github.com/DataDog/integrations-core/pull/12653 'foundationdb', # https://github.com/DataDog/integrations-core/pull/12653 'openstacksdk', # https://github.com/DataDog/integrations-core/pull/12653 + 'snmp', # https://github.com/DataDog/integrations-core/pull/12653 } # Dependencies for the downloader that are security-related and should be updated separately from the others diff --git a/snmp/pyproject.toml b/snmp/pyproject.toml index 926dd79ded3cf..a972e9f9816a1 100644 --- a/snmp/pyproject.toml +++ b/snmp/pyproject.toml @@ -42,11 +42,11 @@ deps = [ "futures==3.3.0; python_version < '3.0'", "ipaddress==1.0.23; python_version < '3.0'", "ply==3.11", - "pyasn1==0.4.8", - "pycryptodomex==3.15.0", + "pyasn1==0.4.6", + "pycryptodomex==3.10.1", "pysmi==0.3.4", "pysnmp-mibs==0.1.6", - "pysnmp==4.4.12", + "pysnmp==4.4.9", ] [project.urls] From 94e4c024726f4649d61cfc936213b36fba1299de Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Wed, 3 Aug 2022 08:52:43 +0200 Subject: [PATCH 12/33] Fixed error in IGNORED_DEPS --- datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b252166c0d812..502e0d36935dd 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py @@ -39,7 +39,7 @@ 'protobuf', # https://github.com/DataDog/integrations-core/pull/12653 'foundationdb', # https://github.com/DataDog/integrations-core/pull/12653 'openstacksdk', # https://github.com/DataDog/integrations-core/pull/12653 - 'snmp', # https://github.com/DataDog/integrations-core/pull/12653 + 'pycryptodomex', # https://github.com/DataDog/integrations-core/pull/12653 } # Dependencies for the downloader that are security-related and should be updated separately from the others From 9bc40501b39249132b9b80c47a8ee3e64218f1e7 Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Wed, 3 Aug 2022 08:55:52 +0200 Subject: [PATCH 13/33] Run 'ddev dep updates --sync' --- amazon_msk/pyproject.toml | 2 +- .../datadog_checks/base/data/agent_requirements.in | 10 +++++----- datadog_checks_base/pyproject.toml | 2 +- mongo/pyproject.toml | 2 +- snmp/pyproject.toml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/amazon_msk/pyproject.toml b/amazon_msk/pyproject.toml index f6b7c6db43110..162d7357547ea 100644 --- a/amazon_msk/pyproject.toml +++ b/amazon_msk/pyproject.toml @@ -40,7 +40,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ "boto3==1.17.112; python_version < '3.0'", - "boto3==1.24.43; python_version > '3.0'", + "boto3==1.24.44; 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 fb95d4cac8b49..157ba4b6b3efa 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -6,10 +6,10 @@ 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.24.43; python_version > '3.0' +boto3==1.24.44; python_version > '3.0' boto==2.49.0 botocore==1.20.112; python_version < '3.0' -botocore==1.27.43; python_version > '3.0' +botocore==1.27.44; 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 @@ -57,19 +57,19 @@ protobuf==3.17.3; python_version < '3.0' protobuf==3.20.1; python_version > '3.0' psutil==5.9.1 psycopg2-binary==2.8.6 -pyasn1==0.4.6 +pyasn1==0.4.8 pycryptodomex==3.10.1 pydantic==1.9.1; python_version > '3.0' pyjwt==1.7.1; python_version < '3.0' pyjwt==2.4.0; python_version > '3.0' -pymongo[srv]==4.2; python_version >= '3.8' +pymongo[srv]==4.2.0; python_version >= '3.8' pymqi==1.12.8 pymysql==0.10.1 pyodbc==4.0.34 pyro4==4.82; sys_platform == 'win32' pysmi==0.3.4 pysnmp-mibs==0.1.6 -pysnmp==4.4.9 +pysnmp==4.4.12 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' diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index 39fffe00c59ea..19a972f9dd967 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -74,7 +74,7 @@ deps = [ http = [ "aws-requests-auth==0.4.3", "botocore==1.20.112; python_version < '3.0'", - "botocore==1.27.43; python_version > '3.0'", + "botocore==1.27.44; python_version > '3.0'", "pyjwt==1.7.1; python_version < '3.0'", "pyjwt==2.4.0; python_version > '3.0'", "pysocks==1.7.1", diff --git a/mongo/pyproject.toml b/mongo/pyproject.toml index 30901ed98ff06..a1d9f88964ece 100644 --- a/mongo/pyproject.toml +++ b/mongo/pyproject.toml @@ -40,7 +40,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "pymongo[srv]==4.2; python_version >= '3.8'" + "pymongo[srv]==4.2.0; python_version >= '3.8'", ] [project.urls] diff --git a/snmp/pyproject.toml b/snmp/pyproject.toml index a972e9f9816a1..96e756623a81b 100644 --- a/snmp/pyproject.toml +++ b/snmp/pyproject.toml @@ -42,11 +42,11 @@ deps = [ "futures==3.3.0; python_version < '3.0'", "ipaddress==1.0.23; python_version < '3.0'", "ply==3.11", - "pyasn1==0.4.6", + "pyasn1==0.4.8", "pycryptodomex==3.10.1", "pysmi==0.3.4", "pysnmp-mibs==0.1.6", - "pysnmp==4.4.9", + "pysnmp==4.4.12", ] [project.urls] From 6a9a646b68b7a24410a06b3a936d926b554e962d Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Wed, 3 Aug 2022 09:40:41 +0200 Subject: [PATCH 14/33] Rollback pysnmp dependency to previous version and added to IGNORED_DEPS --- .../datadog_checks/base/data/agent_requirements.in | 4 ++-- datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py | 2 +- snmp/pyproject.toml | 4 ++-- 3 files changed, 5 insertions(+), 5 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 157ba4b6b3efa..2e0f7d83cd306 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -58,7 +58,7 @@ protobuf==3.20.1; python_version > '3.0' psutil==5.9.1 psycopg2-binary==2.8.6 pyasn1==0.4.8 -pycryptodomex==3.10.1 +pycryptodomex==3.15.0 pydantic==1.9.1; python_version > '3.0' pyjwt==1.7.1; python_version < '3.0' pyjwt==2.4.0; python_version > '3.0' @@ -69,7 +69,7 @@ pyodbc==4.0.34 pyro4==4.82; sys_platform == 'win32' pysmi==0.3.4 pysnmp-mibs==0.1.6 -pysnmp==4.4.12 +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' 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 502e0d36935dd..497177f213b60 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py @@ -39,7 +39,7 @@ 'protobuf', # https://github.com/DataDog/integrations-core/pull/12653 'foundationdb', # https://github.com/DataDog/integrations-core/pull/12653 'openstacksdk', # https://github.com/DataDog/integrations-core/pull/12653 - 'pycryptodomex', # https://github.com/DataDog/integrations-core/pull/12653 + 'pysnmp', # https://github.com/DataDog/integrations-core/pull/12653 } # Dependencies for the downloader that are security-related and should be updated separately from the others diff --git a/snmp/pyproject.toml b/snmp/pyproject.toml index 96e756623a81b..16f11a846db2d 100644 --- a/snmp/pyproject.toml +++ b/snmp/pyproject.toml @@ -43,10 +43,10 @@ deps = [ "ipaddress==1.0.23; python_version < '3.0'", "ply==3.11", "pyasn1==0.4.8", - "pycryptodomex==3.10.1", + "pycryptodomex==3.15.0", "pysmi==0.3.4", "pysnmp-mibs==0.1.6", - "pysnmp==4.4.12", + "pysnmp==4.4.9", ] [project.urls] From cbf4ec2fee0c6e2e8d48fb5eacc1c0e8f613658a Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Wed, 3 Aug 2022 10:04:13 +0200 Subject: [PATCH 15/33] Rollback pycryptodomex dependency to previous version and added to IGNORED_DEPS --- .../datadog_checks/base/data/agent_requirements.in | 2 +- datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py | 1 + snmp/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 2e0f7d83cd306..44565f7db9177 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -58,7 +58,7 @@ protobuf==3.20.1; python_version > '3.0' psutil==5.9.1 psycopg2-binary==2.8.6 pyasn1==0.4.8 -pycryptodomex==3.15.0 +pycryptodomex==3.10.1 pydantic==1.9.1; python_version > '3.0' pyjwt==1.7.1; python_version < '3.0' pyjwt==2.4.0; 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 497177f213b60..e5c053f47deba 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py @@ -39,6 +39,7 @@ 'protobuf', # https://github.com/DataDog/integrations-core/pull/12653 'foundationdb', # https://github.com/DataDog/integrations-core/pull/12653 'openstacksdk', # https://github.com/DataDog/integrations-core/pull/12653 + 'pycryptodomex', # https://github.com/DataDog/integrations-core/pull/12653 'pysnmp', # https://github.com/DataDog/integrations-core/pull/12653 } diff --git a/snmp/pyproject.toml b/snmp/pyproject.toml index 16f11a846db2d..26552753a1dec 100644 --- a/snmp/pyproject.toml +++ b/snmp/pyproject.toml @@ -43,7 +43,7 @@ deps = [ "ipaddress==1.0.23; python_version < '3.0'", "ply==3.11", "pyasn1==0.4.8", - "pycryptodomex==3.15.0", + "pycryptodomex==3.10.1", "pysmi==0.3.4", "pysnmp-mibs==0.1.6", "pysnmp==4.4.9", From 91494e213e398bf67dd6cf0fff6351caa45fe94c Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Wed, 3 Aug 2022 10:30:58 +0200 Subject: [PATCH 16/33] Rollback pyasn1 dependency to previous version and added to IGNORED_DEPS --- .../datadog_checks/base/data/agent_requirements.in | 2 +- datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py | 1 + snmp/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 44565f7db9177..9ac871ab83737 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -57,7 +57,7 @@ protobuf==3.17.3; python_version < '3.0' protobuf==3.20.1; python_version > '3.0' psutil==5.9.1 psycopg2-binary==2.8.6 -pyasn1==0.4.8 +pyasn1==0.4.6 pycryptodomex==3.10.1 pydantic==1.9.1; python_version > '3.0' pyjwt==1.7.1; 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 e5c053f47deba..ca680d7096ab7 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py @@ -39,6 +39,7 @@ 'protobuf', # https://github.com/DataDog/integrations-core/pull/12653 'foundationdb', # https://github.com/DataDog/integrations-core/pull/12653 'openstacksdk', # https://github.com/DataDog/integrations-core/pull/12653 + 'pyasn1', # https://github.com/DataDog/integrations-core/pull/12653 'pycryptodomex', # https://github.com/DataDog/integrations-core/pull/12653 'pysnmp', # https://github.com/DataDog/integrations-core/pull/12653 } diff --git a/snmp/pyproject.toml b/snmp/pyproject.toml index 26552753a1dec..a972e9f9816a1 100644 --- a/snmp/pyproject.toml +++ b/snmp/pyproject.toml @@ -42,7 +42,7 @@ deps = [ "futures==3.3.0; python_version < '3.0'", "ipaddress==1.0.23; python_version < '3.0'", "ply==3.11", - "pyasn1==0.4.8", + "pyasn1==0.4.6", "pycryptodomex==3.10.1", "pysmi==0.3.4", "pysnmp-mibs==0.1.6", From cde531386630de5c7588cbb30e60bef86b7b941c Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Wed, 3 Aug 2022 10:48:59 +0200 Subject: [PATCH 17/33] Rollback lz4 dependency to previous version and added to IGNORED_DEPS --- clickhouse/pyproject.toml | 2 +- .../datadog_checks/base/data/agent_requirements.in | 2 +- datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/clickhouse/pyproject.toml b/clickhouse/pyproject.toml index a6ac05d500226..6c44c13cfe40a 100644 --- a/clickhouse/pyproject.toml +++ b/clickhouse/pyproject.toml @@ -43,7 +43,7 @@ deps = [ "clickhouse-driver==0.2.0; python_version < '3.0'", "clickhouse-driver==0.2.4; python_version > '3.0'", "lz4==2.2.1; python_version < '3.0'", - "lz4==4.0.2; python_version > '3.0'", + "lz4==3.1.3; 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 9ac871ab83737..495636aa037ac 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -43,7 +43,7 @@ kubernetes==24.2.0; python_version > '3.0' ldap3==2.9.1 lxml==4.9.1 lz4==2.2.1; python_version < '3.0' -lz4==4.0.2; python_version > '3.0' +lz4==3.1.3; python_version > '3.0' mmh3==2.5.1; python_version < '3.0' mmh3==3.0.0; python_version > '3.0' openstacksdk==0.39.0; 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 ca680d7096ab7..ca07f825e1e9b 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py @@ -42,6 +42,7 @@ 'pyasn1', # https://github.com/DataDog/integrations-core/pull/12653 'pycryptodomex', # https://github.com/DataDog/integrations-core/pull/12653 'pysnmp', # https://github.com/DataDog/integrations-core/pull/12653 + 'lz4', # https://github.com/DataDog/integrations-core/pull/12653 } # Dependencies for the downloader that are security-related and should be updated separately from the others From 6dfc2460236ca71fcfcae993d8359aac2a23a707 Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Wed, 3 Aug 2022 11:51:59 +0200 Subject: [PATCH 18/33] Rollback clickhouse-driver dependency to previous version and added to IGNORED_DEPS --- clickhouse/pyproject.toml | 2 +- .../datadog_checks/base/data/agent_requirements.in | 2 +- datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/clickhouse/pyproject.toml b/clickhouse/pyproject.toml index 6c44c13cfe40a..17c195c9c6de4 100644 --- a/clickhouse/pyproject.toml +++ b/clickhouse/pyproject.toml @@ -41,7 +41,7 @@ text = "BSD-3-Clause" deps = [ "clickhouse-cityhash==1.0.2.3", "clickhouse-driver==0.2.0; python_version < '3.0'", - "clickhouse-driver==0.2.4; python_version > '3.0'", + "clickhouse-driver==0.2.3; python_version > '3.0'", "lz4==2.2.1; python_version < '3.0'", "lz4==3.1.3; 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 495636aa037ac..983f9f4e827c7 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -14,7 +14,7 @@ cachetools==3.1.1; python_version < '3.0' cachetools==5.2.0; python_version > '3.0' clickhouse-cityhash==1.0.2.3 clickhouse-driver==0.2.0; python_version < '3.0' -clickhouse-driver==0.2.4; python_version > '3.0' +clickhouse-driver==0.2.3; python_version > '3.0' contextlib2==0.6.0.post1; python_version < '3.0' cryptography==3.3.2; python_version < '3.0' cryptography==3.4.8; 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 ca07f825e1e9b..684e9a76dc0f6 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py @@ -42,6 +42,7 @@ 'pyasn1', # https://github.com/DataDog/integrations-core/pull/12653 'pycryptodomex', # https://github.com/DataDog/integrations-core/pull/12653 'pysnmp', # https://github.com/DataDog/integrations-core/pull/12653 + 'clickhouse-driver', # https://github.com/DataDog/integrations-core/pull/12653 'lz4', # https://github.com/DataDog/integrations-core/pull/12653 } From 90a69eed9e1206ba66415dc90b362f0f6052160e Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Wed, 3 Aug 2022 14:21:28 +0200 Subject: [PATCH 19/33] Rollback pyodbc dependency to previous version and added to IGNORED_DEPS --- .../datadog_checks/base/data/agent_requirements.in | 2 +- datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py | 1 + ibm_i/pyproject.toml | 2 +- sqlserver/pyproject.toml | 2 +- 4 files changed, 4 insertions(+), 3 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 983f9f4e827c7..4bb8eb5253b55 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -65,7 +65,7 @@ pyjwt==2.4.0; python_version > '3.0' pymongo[srv]==4.2.0; python_version >= '3.8' pymqi==1.12.8 pymysql==0.10.1 -pyodbc==4.0.34 +pyodbc==4.0.32 pyro4==4.82; sys_platform == 'win32' pysmi==0.3.4 pysnmp-mibs==0.1.6 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 684e9a76dc0f6..b659cb28b0586 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py @@ -44,6 +44,7 @@ 'pysnmp', # https://github.com/DataDog/integrations-core/pull/12653 'clickhouse-driver', # https://github.com/DataDog/integrations-core/pull/12653 'lz4', # https://github.com/DataDog/integrations-core/pull/12653 + 'pyodbc', # https://github.com/DataDog/integrations-core/pull/12653 } # Dependencies for the downloader that are security-related and should be updated separately from the others diff --git a/ibm_i/pyproject.toml b/ibm_i/pyproject.toml index 4bb00d8270170..db947bcc394be 100644 --- a/ibm_i/pyproject.toml +++ b/ibm_i/pyproject.toml @@ -39,7 +39,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "pyodbc==4.0.34", + "pyodbc==4.0.32", ] [project.urls] diff --git a/sqlserver/pyproject.toml b/sqlserver/pyproject.toml index 8a57651a79539..71167da8e4e1c 100644 --- a/sqlserver/pyproject.toml +++ b/sqlserver/pyproject.toml @@ -41,7 +41,7 @@ text = "BSD-3-Clause" deps = [ "adodbapi==2.6.2.0; sys_platform == 'win32'", "lxml==4.9.1", - "pyodbc==4.0.34", + "pyodbc==4.0.32", "pyro4==4.82; sys_platform == 'win32'", "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", "pywin32==304; sys_platform == 'win32' and python_version > '3.0'", From d82a9cc28f2d11a3098ca818eba23e57189a6723 Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Wed, 3 Aug 2022 15:23:01 +0200 Subject: [PATCH 20/33] Rollback psutil dependency to previous version and added to IGNORED_DEPS --- btrfs/pyproject.toml | 2 +- .../datadog_checks/base/data/agent_requirements.in | 2 +- datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py | 1 + disk/pyproject.toml | 2 +- gunicorn/pyproject.toml | 2 +- network/pyproject.toml | 2 +- process/pyproject.toml | 2 +- system_core/pyproject.toml | 2 +- system_swap/pyproject.toml | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) diff --git a/btrfs/pyproject.toml b/btrfs/pyproject.toml index 4cc1b550fa14d..d7a9b913beb4d 100644 --- a/btrfs/pyproject.toml +++ b/btrfs/pyproject.toml @@ -39,7 +39,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "psutil==5.9.1", + "psutil==5.9.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 4bb8eb5253b55..99da68b813222 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -55,7 +55,7 @@ prometheus-client==0.12.0; python_version < '3.0' prometheus-client==0.14.1; python_version > '3.0' protobuf==3.17.3; python_version < '3.0' protobuf==3.20.1; python_version > '3.0' -psutil==5.9.1 +psutil==5.9.0 psycopg2-binary==2.8.6 pyasn1==0.4.6 pycryptodomex==3.10.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 b659cb28b0586..c424ca811f137 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py @@ -45,6 +45,7 @@ 'clickhouse-driver', # https://github.com/DataDog/integrations-core/pull/12653 'lz4', # https://github.com/DataDog/integrations-core/pull/12653 'pyodbc', # https://github.com/DataDog/integrations-core/pull/12653 + 'psutil', # https://github.com/DataDog/integrations-core/pull/12653 } # Dependencies for the downloader that are security-related and should be updated separately from the others diff --git a/disk/pyproject.toml b/disk/pyproject.toml index a773ef85617a1..de4b340466a42 100644 --- a/disk/pyproject.toml +++ b/disk/pyproject.toml @@ -39,7 +39,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "psutil==5.9.1", + "psutil==5.9.0", ] [project.urls] diff --git a/gunicorn/pyproject.toml b/gunicorn/pyproject.toml index 0e257431fb86b..4601e4bf41ff0 100644 --- a/gunicorn/pyproject.toml +++ b/gunicorn/pyproject.toml @@ -39,7 +39,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "psutil==5.9.1", + "psutil==5.9.0", ] [project.urls] diff --git a/network/pyproject.toml b/network/pyproject.toml index 75a98de909674..97aba45e327e1 100644 --- a/network/pyproject.toml +++ b/network/pyproject.toml @@ -39,7 +39,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "psutil==5.9.1", + "psutil==5.9.0", ] [project.urls] diff --git a/process/pyproject.toml b/process/pyproject.toml index a0015382cfb50..5c4d0f77e9990 100644 --- a/process/pyproject.toml +++ b/process/pyproject.toml @@ -39,7 +39,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "psutil==5.9.1", + "psutil==5.9.0", ] [project.urls] diff --git a/system_core/pyproject.toml b/system_core/pyproject.toml index 1c51f9d63e06d..112274b4974aa 100644 --- a/system_core/pyproject.toml +++ b/system_core/pyproject.toml @@ -39,7 +39,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "psutil==5.9.1", + "psutil==5.9.0", ] [project.urls] diff --git a/system_swap/pyproject.toml b/system_swap/pyproject.toml index 7be1d415308e7..382d7d2e8238a 100644 --- a/system_swap/pyproject.toml +++ b/system_swap/pyproject.toml @@ -39,7 +39,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "psutil==5.9.1", + "psutil==5.9.0", ] [project.urls] From b4fb1bdb332d27b0c7d1efaf8b82e0df246fa634 Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Wed, 3 Aug 2022 17:55:37 +0200 Subject: [PATCH 21/33] Update style dependencies to the latest versions --- .../datadog_checks/dev/plugin/tox.py | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/datadog_checks_dev/datadog_checks/dev/plugin/tox.py b/datadog_checks_dev/datadog_checks/dev/plugin/tox.py index 66e5242e057ab..b055a49977d2b 100644 --- a/datadog_checks_dev/datadog_checks/dev/plugin/tox.py +++ b/datadog_checks_dev/datadog_checks/dev/plugin/tox.py @@ -20,21 +20,22 @@ # Style deps: # We pin deps in order to make CI more stable/reliable. ISORT_DEP = 'isort==5.10.1' -BLACK_DEP = 'black==22.3.0' -FLAKE8_DEP = 'flake8==4.0.1' -FLAKE8_BUGBEAR_DEP = 'flake8-bugbear==22.1.11' -FLAKE8_LOGGING_FORMAT_DEP = 'flake8-logging-format==0.6.0' +BLACK_DEP = 'black==22.6.0' +FLAKE8_DEP = 'flake8==5.0.3' +FLAKE8_BUGBEAR_DEP = 'flake8-bugbear==22.7.1' +# TODO: update when fix is released https://github.com/globality-corp/flake8-logging-format/pull/33 +FLAKE8_LOGGING_FORMAT_DEP = 'flake8-logging-format @ git+https://github.com/globality-corp/flake8-logging-format.git@f3cdb24468241ebe85e41b0bd2e8958c76b4dec6' # TODO: remove extra when we drop Python 2 -MYPY_DEP = 'mypy[python2]==0.910' +MYPY_DEP = 'mypy[python2]==0.971' # TODO: when we drop Python 2 and replace with --install-types --non-interactive TYPES_DEPS = [ - 'types-PyYAML==5.4.10', - 'types-python-dateutil==2.8.2', - 'types_requests==2.25.11', - 'types_six==1.16.2', - 'types-simplejson==3.17.5', + 'types-PyYAML==6.0.11', + 'types-python-dateutil==2.8.19', + 'types_requests==2.28.7', + 'types_six==1.16.18', + 'types-simplejson==3.17.7', ] -PYDANTIC_DEP = 'pydantic==1.8.2' # Keep in sync with: /datadog_checks_base/requirements.in +PYDANTIC_DEP = 'pydantic==1.9.1' # Keep in sync with: /datadog_checks_base/requirements.in @tox.hookimpl From d957cf3967bd493d9d07759fe7ba671b50e0f0d2 Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Wed, 3 Aug 2022 18:19:45 +0200 Subject: [PATCH 22/33] Rollback python2 style dependencies --- datadog_checks_dev/datadog_checks/dev/plugin/tox.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/datadog_checks_dev/datadog_checks/dev/plugin/tox.py b/datadog_checks_dev/datadog_checks/dev/plugin/tox.py index b055a49977d2b..75466fd34c8ad 100644 --- a/datadog_checks_dev/datadog_checks/dev/plugin/tox.py +++ b/datadog_checks_dev/datadog_checks/dev/plugin/tox.py @@ -26,14 +26,14 @@ # TODO: update when fix is released https://github.com/globality-corp/flake8-logging-format/pull/33 FLAKE8_LOGGING_FORMAT_DEP = 'flake8-logging-format @ git+https://github.com/globality-corp/flake8-logging-format.git@f3cdb24468241ebe85e41b0bd2e8958c76b4dec6' # TODO: remove extra when we drop Python 2 -MYPY_DEP = 'mypy[python2]==0.971' +MYPY_DEP = 'mypy[python2]==0.910' # TODO: when we drop Python 2 and replace with --install-types --non-interactive TYPES_DEPS = [ - 'types-PyYAML==6.0.11', - 'types-python-dateutil==2.8.19', - 'types_requests==2.28.7', - 'types_six==1.16.18', - 'types-simplejson==3.17.7', + 'types-PyYAML==5.4.10', + 'types-python-dateutil==2.8.2', + 'types_requests==2.25.11', + 'types_six==1.16.2', + 'types-simplejson==3.17.5', ] PYDANTIC_DEP = 'pydantic==1.9.1' # Keep in sync with: /datadog_checks_base/requirements.in From c1b9b774ef5e8cc4c390d195a68bf5eec0df836b Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Thu, 4 Aug 2022 09:04:35 +0200 Subject: [PATCH 23/33] Fixed 'B020 Found for loop that reassigns the iterable it is iterating with each iterable value' errors --- envoy/datadog_checks/envoy/envoy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/envoy/datadog_checks/envoy/envoy.py b/envoy/datadog_checks/envoy/envoy.py index 0ae87b46c4c77..09b4b6125fcbb 100644 --- a/envoy/datadog_checks/envoy/envoy.py +++ b/envoy/datadog_checks/envoy/envoy.py @@ -136,8 +136,8 @@ def check(self, _): # If the value isn't an integer assume it's pre-computed histogram data. except (ValueError, TypeError): - for metric, value in parse_histogram(metric, value): - self.gauge(metric, value, tags=tags) + for histo_metric, histo_value in parse_histogram(metric, value): + self.gauge(histo_metric, histo_value, tags=tags) self.service_check(self.SERVICE_CHECK_NAME, AgentCheck.OK, tags=self.custom_tags) From 5d3ecfe7cbacc3d31bdfaaa5d2893cfb74100963 Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Thu, 4 Aug 2022 09:07:48 +0200 Subject: [PATCH 24/33] Fixed 'B020 Found for loop that reassigns the iterable it is iterating with each iterable value' error --- couch/datadog_checks/couch/couch.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/couch/datadog_checks/couch/couch.py b/couch/datadog_checks/couch/couch.py index c598199aa7fe2..2ba92a6896910 100644 --- a/couch/datadog_checks/couch/couch.py +++ b/couch/datadog_checks/couch/couch.py @@ -206,14 +206,14 @@ def _build_metrics(self, data, tags, prefix='couchdb'): for key, value in iteritems(data): if "type" in value: if value["type"] == "histogram": - for metric, value in iteritems(value["value"]): + for metric, histo_value in iteritems(value["value"]): if metric == "histogram": continue elif metric == "percentile": - for pair in value: + for pair in histo_value: self.gauge("{0}.{1}.percentile.{2}".format(prefix, key, pair[0]), pair[1], tags=tags) else: - self.gauge("{0}.{1}.{2}".format(prefix, key, metric), value, tags=tags) + self.gauge("{0}.{1}.{2}".format(prefix, key, metric), histo_value, tags=tags) else: self.gauge("{0}.{1}".format(prefix, key), value["value"], tags=tags) elif isinstance(value, dict): From f2e2e896b049b15385a9648f3945d58fc83ab17c Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Thu, 4 Aug 2022 09:21:39 +0200 Subject: [PATCH 25/33] Fixed 'B023 Function definition does not bind loop variable 'line'' error --- mapr/tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapr/tests/conftest.py b/mapr/tests/conftest.py index aee5b4c239a80..0a34a5988385d 100644 --- a/mapr/tests/conftest.py +++ b/mapr/tests/conftest.py @@ -46,7 +46,7 @@ def mock_getconnection(): def messages_iter(): with open(os.path.join(common.HERE, 'fixtures', 'metrics.txt'), 'r') as f: for line in f: - msg = mock.MagicMock(error=lambda: None, value=lambda: line) + msg = mock.MagicMock(error=None, value=line) yield msg yield None From 10281294622686d034faa3e47a8d6b8c1bfca57d Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Thu, 4 Aug 2022 09:42:16 +0200 Subject: [PATCH 26/33] Fixed 'B023 Function definition does not bind loop variable 'line'' error --- mapr/tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mapr/tests/conftest.py b/mapr/tests/conftest.py index 0a34a5988385d..30306d9263904 100644 --- a/mapr/tests/conftest.py +++ b/mapr/tests/conftest.py @@ -46,7 +46,7 @@ def mock_getconnection(): def messages_iter(): with open(os.path.join(common.HERE, 'fixtures', 'metrics.txt'), 'r') as f: for line in f: - msg = mock.MagicMock(error=None, value=line) + msg = mock.MagicMock(error=lambda: None, value=lambda line=line: line) yield msg yield None From f13c5a67ca5dbf8ecb5d3a0fbc37940b98b30841 Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Thu, 4 Aug 2022 09:59:10 +0200 Subject: [PATCH 27/33] Fixed 'E501 line too long (121 > 120 characters)' error --- openstack/datadog_checks/openstack/openstack.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openstack/datadog_checks/openstack/openstack.py b/openstack/datadog_checks/openstack/openstack.py index ad001ce7e0217..207ee9126727e 100644 --- a/openstack/datadog_checks/openstack/openstack.py +++ b/openstack/datadog_checks/openstack/openstack.py @@ -394,8 +394,8 @@ def from_config(cls, init_config, instance_config, proxy_config=None): assert ( t_id and t_id not in service_catalog.nova_endpoint - ), """Incorrect use of append_tenant_id, please inspect the service catalog response of your Identity server. - You may need to disable this flag if your Nova service url contains the tenant_id already""" + ), """Incorrect use of append_tenant_id, please inspect the service catalog response of your Identity \ + server. You may need to disable this flag if your Nova service url contains the tenant_id already """ service_catalog.nova_endpoint = urljoin(service_catalog.nova_endpoint, t_id) From 03aeb96d9bd9af2ad1df0584ebba0ca3cdab0b72 Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Thu, 4 Aug 2022 10:00:46 +0200 Subject: [PATCH 28/33] Fixed 'B020 Found for loop that reassigns the iterable it is iterating with each iterable value.' error --- openstack/tests/test_openstack.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openstack/tests/test_openstack.py b/openstack/tests/test_openstack.py index 36dcaea9a0c8c..28e8e302cc019 100644 --- a/openstack/tests/test_openstack.py +++ b/openstack/tests/test_openstack.py @@ -138,10 +138,10 @@ def test_unscoped_from_config(): assert scope.auth_token == 'fake_token' assert len(scope.project_scope_map) == 1 - for _, scope in iteritems(scope.project_scope_map): - assert isinstance(scope, OpenStackProjectScope) - assert scope.auth_token == 'fake_token' - assert scope.tenant_id == '263fd9' + for _, project_scope in iteritems(scope.project_scope_map): + assert isinstance(project_scope, OpenStackProjectScope) + assert project_scope.auth_token == 'fake_token' + assert project_scope.tenant_id == '263fd9' def test_get_nova_endpoint(): From d1a63472eb053d0932d60d5fb2fcf22a68ab0682 Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Thu, 4 Aug 2022 10:31:30 +0200 Subject: [PATCH 29/33] Fixed 'B023 Function definition does not bind loop variable' error --- sonarqube/datadog_checks/sonarqube/check.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sonarqube/datadog_checks/sonarqube/check.py b/sonarqube/datadog_checks/sonarqube/check.py index 52e045e98a1fc..8b0c1d8b994f3 100644 --- a/sonarqube/datadog_checks/sonarqube/check.py +++ b/sonarqube/datadog_checks/sonarqube/check.py @@ -133,11 +133,11 @@ def parse_config(self): if not isinstance(config, dict): raise ConfigurationError('Component `{}` must refer to a mapping'.format(component)) - should_include_metric = self.create_metric_matcher( + include_metric = self.create_metric_matcher( self.compile_metric_patterns(config, 'include') or default_metric_inclusion_pattern, default=True, ) - should_exclude_metric = self.create_metric_matcher( + exclude_metric = self.create_metric_matcher( self.compile_metric_patterns(config, 'exclude') or default_metric_exclusion_pattern, default=False, ) @@ -148,7 +148,8 @@ def parse_config(self): component_data[component] = ( tag_name, - lambda metric: should_include_metric(metric) and not should_exclude_metric(metric), + lambda metric, include_metric=include_metric, exclude_metric=exclude_metric: include_metric(metric) + and not exclude_metric(metric), ) self._components = component_data From 8f3d1500143ed389b4224e914732372891ed1736 Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Thu, 4 Aug 2022 10:45:06 +0200 Subject: [PATCH 30/33] Fixed 'E501 line too long (158 > 120 characters)' error --- datadog_checks_dev/datadog_checks/dev/plugin/tox.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/datadog_checks_dev/datadog_checks/dev/plugin/tox.py b/datadog_checks_dev/datadog_checks/dev/plugin/tox.py index 75466fd34c8ad..701efe20c7fd2 100644 --- a/datadog_checks_dev/datadog_checks/dev/plugin/tox.py +++ b/datadog_checks_dev/datadog_checks/dev/plugin/tox.py @@ -24,7 +24,8 @@ FLAKE8_DEP = 'flake8==5.0.3' FLAKE8_BUGBEAR_DEP = 'flake8-bugbear==22.7.1' # TODO: update when fix is released https://github.com/globality-corp/flake8-logging-format/pull/33 -FLAKE8_LOGGING_FORMAT_DEP = 'flake8-logging-format @ git+https://github.com/globality-corp/flake8-logging-format.git@f3cdb24468241ebe85e41b0bd2e8958c76b4dec6' +FLAKE8_LOGGING_FORMAT_DEP = 'flake8-logging-format @ git+https://github.com/globality-corp/flake8-logging-format.git' \ + '@f3cdb24468241ebe85e41b0bd2e8958c76b4dec6 ' # TODO: remove extra when we drop Python 2 MYPY_DEP = 'mypy[python2]==0.910' # TODO: when we drop Python 2 and replace with --install-types --non-interactive From b876d20a859a9a927870dca28620902e23281d73 Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Thu, 4 Aug 2022 11:20:51 +0200 Subject: [PATCH 31/33] Fixed 'B023 Function definition does not bind loop variable' error --- .../datadog_checks/base/checks/windows/perf_counters/base.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/datadog_checks_base/datadog_checks/base/checks/windows/perf_counters/base.py b/datadog_checks_base/datadog_checks/base/checks/windows/perf_counters/base.py index e8daa87b4a01e..bb87b56951653 100644 --- a/datadog_checks_base/datadog_checks/base/checks/windows/perf_counters/base.py +++ b/datadog_checks_base/datadog_checks/base/checks/windows/perf_counters/base.py @@ -62,7 +62,9 @@ def _query_counters(self): # Counters are lazily configured and any errors should prevent check execution exception_class = type(e) message = str(e) - self.check_initializations.append(lambda: raise_exception(exception_class, message)) + self.check_initializations.append( + lambda exception_class=exception_class, message=message: raise_exception(exception_class, message) + ) return except Exception as e: self.log.error('Error refreshing counters for performance object `%s`: %s', perf_object.name, e) From aac4978a11414e72ee634a7d10dc8a764a123dfc Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Thu, 4 Aug 2022 11:50:20 +0200 Subject: [PATCH 32/33] Fixed datadog_checks_dev style error --- datadog_checks_dev/datadog_checks/dev/plugin/tox.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/datadog_checks_dev/datadog_checks/dev/plugin/tox.py b/datadog_checks_dev/datadog_checks/dev/plugin/tox.py index 701efe20c7fd2..953d22d3fcf98 100644 --- a/datadog_checks_dev/datadog_checks/dev/plugin/tox.py +++ b/datadog_checks_dev/datadog_checks/dev/plugin/tox.py @@ -24,8 +24,10 @@ FLAKE8_DEP = 'flake8==5.0.3' FLAKE8_BUGBEAR_DEP = 'flake8-bugbear==22.7.1' # TODO: update when fix is released https://github.com/globality-corp/flake8-logging-format/pull/33 -FLAKE8_LOGGING_FORMAT_DEP = 'flake8-logging-format @ git+https://github.com/globality-corp/flake8-logging-format.git' \ - '@f3cdb24468241ebe85e41b0bd2e8958c76b4dec6 ' +FLAKE8_LOGGING_FORMAT_DEP = ( + 'flake8-logging-format @ git+https://github.com/globality-corp/flake8-logging-format.git' + '@f3cdb24468241ebe85e41b0bd2e8958c76b4dec6 ' +) # TODO: remove extra when we drop Python 2 MYPY_DEP = 'mypy[python2]==0.910' # TODO: when we drop Python 2 and replace with --install-types --non-interactive From f104792ec2a797caf091b4176939abf4ea17f91c Mon Sep 17 00:00:00 2001 From: Jose Manuel Almaza Date: Thu, 4 Aug 2022 17:36:13 +0200 Subject: [PATCH 33/33] Improved comments about ignored deps --- .../dev/tooling/commands/dep.py | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 c424ca811f137..ef98facc48511 100644 --- a/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py +++ b/datadog_checks_dev/datadog_checks/dev/tooling/commands/dep.py @@ -36,16 +36,16 @@ 'cryptography', 'dnspython', 'pymysql', # https://github.com/DataDog/integrations-core/pull/12612 - 'protobuf', # https://github.com/DataDog/integrations-core/pull/12653 - 'foundationdb', # https://github.com/DataDog/integrations-core/pull/12653 - 'openstacksdk', # https://github.com/DataDog/integrations-core/pull/12653 - 'pyasn1', # https://github.com/DataDog/integrations-core/pull/12653 - 'pycryptodomex', # https://github.com/DataDog/integrations-core/pull/12653 - 'pysnmp', # https://github.com/DataDog/integrations-core/pull/12653 - 'clickhouse-driver', # https://github.com/DataDog/integrations-core/pull/12653 - 'lz4', # https://github.com/DataDog/integrations-core/pull/12653 - 'pyodbc', # https://github.com/DataDog/integrations-core/pull/12653 - 'psutil', # https://github.com/DataDog/integrations-core/pull/12653 + 'protobuf', # Breaking datadog_checks_base + 'foundationdb', # Breaking datadog_checks_base tests + 'openstacksdk', # Breaking openstack_controller tests + 'pyasn1', # Breaking snmp tests + 'pycryptodomex', # Breaking snmp tests + 'pysnmp', # Breaking snmp tests + 'clickhouse-driver', # Breaking clickhouse tests + 'lz4', # Breaking clickhouse tests + 'pyodbc', # Breaking sqlserver tests + 'psutil', # Breaking disk tests } # Dependencies for the downloader that are security-related and should be updated separately from the others