Update dependencies (#18187)

* Update dependencies * update confluent-kafka hash * fix cryptography dependency conflict * update ci script and hatch.toml --------- Co-authored-by: FlorentClarret <1266346+FlorentClarret@users.noreply.github.com> Co-authored-by: Kyle-Neale <kyle.neale@datadoghq.com>
DataDog · Aug 6, 2024 · e991a9b · e991a9b
1 parent 70c918d
commit e991a9b
Show file tree

Hide file tree

Showing 30 changed files with 55 additions and 40 deletions.
diff --git a/.builders/images/linux-aarch64/build_script.sh b/.builders/images/linux-aarch64/build_script.sh
@@ -21,7 +21,7 @@ if [[ "${DD_BUILD_PYTHON_VERSION}" == "3" ]]; then
     LDFLAGS="${LDFLAGS} -L/usr/local/lib -lkrb5 -lgssapi_krb5 -llmdb" \
     DOWNLOAD_URL="https://github.com/confluentinc/librdkafka/archive/refs/tags/v{{version}}.tar.gz" \
         VERSION="${kafka_version}" \
-        SHA256="d645e47d961db47f1ead29652606a502bdd2a880c85c1e060e94eea040f1a19a" \
+        SHA256="3dc62de731fd516dfb1032861d9a580d4d0b5b0856beb0f185d06df8e6c26259" \
         RELATIVE_PATH="librdkafka-{{version}}" \
         bash install-from-source.sh --enable-sasl --enable-curl
     always_build+=("confluent-kafka")

diff --git a/.builders/images/linux-x86_64/build_script.sh b/.builders/images/linux-x86_64/build_script.sh
@@ -18,7 +18,7 @@ if [[ "${DD_BUILD_PYTHON_VERSION}" == "3" ]]; then
     LDFLAGS="${LDFLAGS} -L/usr/local/lib -lkrb5 -lgssapi_krb5 -llmdb" \
     DOWNLOAD_URL="https://github.com/confluentinc/librdkafka/archive/refs/tags/v{{version}}.tar.gz" \
         VERSION="${kafka_version}" \
-        SHA256="d645e47d961db47f1ead29652606a502bdd2a880c85c1e060e94eea040f1a19a" \
+        SHA256="3dc62de731fd516dfb1032861d9a580d4d0b5b0856beb0f185d06df8e6c26259" \
         RELATIVE_PATH="librdkafka-{{version}}" \
         bash install-from-source.sh --enable-sasl --enable-curl
     always_build+=("confluent-kafka")

diff --git a/.builders/images/macos-x86_64/extra_build.sh b/.builders/images/macos-x86_64/extra_build.sh
@@ -13,7 +13,7 @@ if [[ "${DD_BUILD_PYTHON_VERSION}" == "3" ]]; then
     LDFLAGS="${LDFLAGS} -L${DD_PREFIX_PATH}/lib -lgssapi_krb5 -llmdb" \
     DOWNLOAD_URL="https://github.com/confluentinc/librdkafka/archive/refs/tags/v{{version}}.tar.gz" \
       VERSION="${kafka_version}" \
-      SHA256="d645e47d961db47f1ead29652606a502bdd2a880c85c1e060e94eea040f1a19a" \
+      SHA256="3dc62de731fd516dfb1032861d9a580d4d0b5b0856beb0f185d06df8e6c26259" \
       RELATIVE_PATH="librdkafka-{{version}}" \
       bash install-from-source.sh --prefix="${DD_PREFIX_PATH}" --enable-sasl --enable-curl
 

diff --git a/.ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh b/.ddev/ci/scripts/kafka_consumer/linux/32_install_kerberos.sh
@@ -8,7 +8,7 @@ sudo apt install -y --no-install-recommends build-essential libkrb5-dev wget sof
 # Install librdkafka from source since no binaries are available for the distribution we use on the CI:
 git clone https://github.com/confluentinc/librdkafka
 cd librdkafka
-git checkout v2.4.0
+git checkout v2.5.0
 sudo ./configure --install-deps --prefix=/usr
 make
 sudo make install

diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
@@ -73,7 +73,9 @@ pydantic,PyPI,MIT,Copyright (c) 2017 to present Pydantic Services Inc. and indiv
 pymongo,PyPI,Apache-2.0,Copyright The MongoDB Python Team
 pymqi,PyPI,PSF,Copyright (c) Zato Source s.r.o.
 pyodbc,PyPI,MIT,Copyright (c) 2008 Michael Kleehammer
+pysmi,PyPI,BSD-2-Clause,Copyright (c) 2015-2020 Ilya Etingof <etingof@gmail.com>
 pysmi,PyPI,BSD-3-Clause,Copyright (c) 2015-2019 Ilya Etingof <etingof@gmail.com>
+pysmi,PyPI,BSD-3-Clause,Copyright (c) 2015-2020 Ilya Etingof <etingof@gmail.com>
 pysnmp,PyPI,BSD-3-Clause,"Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com>"
 pysnmp-mibs,PyPI,BSD-3-Clause,"Copyright (c) 2005-2016, Ilya Etingof <ilya@glas.net>"
 python-binary-memcached,PyPI,MIT,Copyright (c) 2011 Jayson Reis

diff --git a/agent_requirements.in b/agent_requirements.in
@@ -6,18 +6,18 @@ beautifulsoup4==4.12.3; 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.34.136; python_version > '3.0'
+boto3==1.34.153; python_version > '3.0'
 boto==2.49.0
 botocore==1.20.112; python_version < '3.0'
-botocore==1.34.136; python_version > '3.0'
+botocore==1.34.153; python_version > '3.0'
 cachetools==3.1.1; python_version < '3.0'
-cachetools==5.3.3; python_version > '3.0'
+cachetools==5.4.0; python_version > '3.0'
 clickhouse-cityhash==1.0.2.3; python_version < '3.0'
 clickhouse-cityhash==1.0.2.4; python_version > '3.0'
 clickhouse-driver==0.2.0; python_version < '3.0'
 clickhouse-driver==0.2.8; python_version > '3.0'
 cm-client==45.0.4
-confluent-kafka==2.4.0; python_version > '3.0'
+confluent-kafka==2.5.0; python_version > '3.0'
 contextlib2==0.6.0.post1; python_version < '3.0'
 cryptography==3.3.2; python_version < '3.0'
 cryptography==42.0.8; python_version > '3.0'
@@ -34,7 +34,7 @@ importlib-metadata==2.1.3; python_version < '3.8'
 in-toto==2.0.0; python_version > '3.0'
 ipaddress==1.0.23; python_version < '3.0'
 jaydebeapi==1.2.3; python_version >= '3.0'
-jellyfish==1.0.4; python_version > '3.0'
+jellyfish==1.1.0; python_version > '3.0'
 jpype1==1.5.0; python_version > '3.0'
 kubernetes==18.20.0; python_version < '3.0'
 kubernetes==30.1.0; python_version > '3.0'
@@ -46,31 +46,32 @@ mmh3==2.5.1; python_version < '3.0'
 mmh3==4.1.0; python_version > '3.0'
 oauthlib==3.1.0; python_version < '3.0'
 oauthlib==3.2.2; python_version > '3.0'
-openstacksdk==3.1.0; python_version > '3.0'
+openstacksdk==3.3.0; python_version > '3.0'
 oracledb==1.3.2; python_version >= '3.0'
-orjson==3.10.5; python_version > '3.0'
+orjson==3.10.6; python_version > '3.0'
 packaging==24.1; python_version > '3.0'
 paramiko==2.12.0; python_version < '3.0'
 paramiko==3.4.0; python_version > '3.0'
 ply==3.11
 prometheus-client==0.12.0; python_version < '3.0'
 prometheus-client==0.20.0; python_version > '3.0'
 protobuf==3.17.3; python_version < '3.0'
-protobuf==5.27.2; python_version > '3.0'
+protobuf==5.27.3; python_version > '3.0'
 psutil==5.9.0
 psycopg2-binary==2.9.9; python_version > '3.0'
 pyasn1==0.4.6
 pycryptodomex==3.20.0
-pydantic==2.7.4; python_version > '3.0'
+pydantic==2.8.2; python_version > '3.0'
 pyjwt==1.7.1; python_version < '3.0'
-pyjwt==2.8.0; python_version > '3.0'
+pyjwt==2.9.0; python_version > '3.0'
 pymongo[srv]==4.8.0; python_version >= '3.9'
 pymqi==1.12.10; (sys_platform != 'darwin' or platform_machine != 'arm64') and python_version > '3.0'
 pymysql==0.10.1; python_version < '3.0'
 pymysql==1.1.1; python_version > '3.0'
 pyodbc==5.1.0; (sys_platform != 'darwin' or platform_machine != 'arm64') and python_version > '3.0'
-pyopenssl==24.1.0; python_version > '3.0'
-pysmi==0.3.4
+pyopenssl==24.2.1; python_version > '3.0'
+pysmi==0.3.4; python_version < '3.0'
+pysmi==1.4.4; python_version > '3.0'
 pysnmp-mibs==0.1.6
 pysnmp==4.4.9
 pysocks==1.7.1
@@ -85,7 +86,7 @@ pywin32==306; sys_platform == 'win32' and python_version > '3.0'
 pyyaml==5.4.1; python_version < '3.0'
 pyyaml==6.0.1; python_version > '3.0'
 redis==3.5.3; python_version < '3.0'
-redis==5.0.7; python_version > '3.0'
+redis==5.0.8; python_version > '3.0'
 requests-kerberos==0.12.0; python_version < '3.0'
 requests-kerberos==0.15.0; python_version > '3.0'
 requests-ntlm==1.1.0; python_version < '3.0'
@@ -106,13 +107,13 @@ service-identity[idna]==21.1.0; python_version < '3.0'
 service-identity[idna]==24.1.0; python_version > '3.0'
 simplejson==3.19.2
 six==1.16.0
-snowflake-connector-python==3.11.0; python_version > '3.0'
+snowflake-connector-python==3.12.0; python_version > '3.0'
 supervisor==4.2.5
 tuf==4.0.0; python_version > '3.0'
 typing==3.10.0.0; python_version < '3.0'
 uptime==3.0.1
 vertica-python==1.2.0; python_version < '3.0'
-vertica-python==1.3.8; python_version > '3.0'
+vertica-python==1.4.0; python_version > '3.0'
 win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0'
 wrapt==1.15.0; python_version < '3.0'
 wrapt==1.16.0; python_version > '3.0'
diff --git a/amazon_msk/changelog.d/18185.added b/amazon_msk/changelog.d/18185.added
@@ -0,0 +1 @@
+Update dependencies
diff --git a/amazon_msk/pyproject.toml b/amazon_msk/pyproject.toml
@@ -40,7 +40,7 @@ license = "BSD-3-Clause"
 [project.optional-dependencies]
 deps = [
     "boto3==1.17.112; python_version < '3.0'",
-    "boto3==1.34.136; python_version > '3.0'",
+    "boto3==1.34.153; python_version > '3.0'",
 ]
 
 [project.urls]

diff --git a/cisco_aci/changelog.d/18185.added b/cisco_aci/changelog.d/18185.added
@@ -0,0 +1 @@
+Update dependencies
diff --git a/datadog_checks_base/changelog.d/18185.added b/datadog_checks_base/changelog.d/18185.added
@@ -0,0 +1 @@
+Update dependencies
diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml
@@ -40,7 +40,7 @@ db = [
 deps = [
     "binary==1.0.0",
     "cachetools==3.1.1; python_version < '3.0'",
-    "cachetools==5.3.3; python_version > '3.0'",
+    "cachetools==5.4.0; python_version > '3.0'",
     "contextlib2==0.6.0.post1; python_version < '3.0'",
     "cryptography==3.3.2; python_version < '3.0'",
     "cryptography==42.0.8; python_version > '3.0'",
@@ -50,12 +50,12 @@ deps = [
     "enum34==1.1.10; python_version < '3.0'",
     "importlib-metadata==2.1.3; python_version < '3.8'",
     "ipaddress==1.0.23; python_version < '3.0'",
-    "jellyfish==1.0.4; python_version > '3.0'",
+    "jellyfish==1.1.0; python_version > '3.0'",
     "prometheus-client==0.12.0; python_version < '3.0'",
     "prometheus-client==0.20.0; python_version > '3.0'",
     "protobuf==3.17.3; python_version < '3.0'",
-    "protobuf==5.27.2; python_version > '3.0'",
-    "pydantic==2.7.4; python_version > '3.0'",
+    "protobuf==5.27.3; python_version > '3.0'",
+    "pydantic==2.8.2; python_version > '3.0'",
     "python-dateutil==2.9.0.post0",
     "pywin32==228; sys_platform == 'win32' and python_version < '3.0'",
     "pywin32==306; sys_platform == 'win32' and python_version > '3.0'",
@@ -76,12 +76,12 @@ deps = [
 http = [
     "aws-requests-auth==0.4.3",
     "botocore==1.20.112; python_version < '3.0'",
-    "botocore==1.34.136; python_version > '3.0'",
+    "botocore==1.34.153; python_version > '3.0'",
     "oauthlib==3.1.0; python_version < '3.0'",
     "oauthlib==3.2.2; python_version > '3.0'",
     "pyjwt==1.7.1; python_version < '3.0'",
-    "pyjwt==2.8.0; python_version > '3.0'",
-    "pyopenssl==24.1.0; python_version > '3.0'",
+    "pyjwt==2.9.0; python_version > '3.0'",
+    "pyopenssl==24.2.1; python_version > '3.0'",
     "pysocks==1.7.1",
     "requests-kerberos==0.12.0; python_version < '3.0'",
     "requests-kerberos==0.15.0; python_version > '3.0'",
@@ -92,7 +92,7 @@ http = [
     "win-inet-pton==1.1.0; sys_platform == 'win32' and python_version < '3.0'",
 ]
 json = [
-    "orjson==3.10.5; python_version > '3.0'",
+    "orjson==3.10.6; python_version > '3.0'",
 ]
 kube = [
     "kubernetes==18.20.0; python_version < '3.0'",

diff --git a/http_check/changelog.d/18185.added b/http_check/changelog.d/18185.added
@@ -0,0 +1 @@
+Update dependencies
diff --git a/kafka_consumer/changelog.d/18185.added b/kafka_consumer/changelog.d/18185.added
@@ -0,0 +1 @@
+Update dependencies
diff --git a/kafka_consumer/hatch.toml b/kafka_consumer/hatch.toml
@@ -5,7 +5,7 @@
 # Also bump the LIBRDKAFKA_VERSION version in this file
 post-install-commands = [
   "python -m pip uninstall -y confluent-kafka",
-  "python -m pip install --no-binary confluent-kafka confluent-kafka==2.4.0",
+  "python -m pip install --no-binary confluent-kafka confluent-kafka==2.5.0",
 ]
 
 [envs.default.env-vars]

diff --git a/kafka_consumer/pyproject.toml b/kafka_consumer/pyproject.toml
@@ -36,9 +36,7 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 deps = [
-    # confluent-kafka is built in omnibus, so bumping it here will have no real effect
-    # if you bump this version, also bump the one in the `hatch.toml` file
-    "confluent-kafka==2.4.0; python_version > '3.0'",
+    "confluent-kafka==2.5.0; python_version > '3.0'",
 ]
 
 [project.urls]

diff --git a/mysql/changelog.d/18185.added b/mysql/changelog.d/18185.added
@@ -0,0 +1 @@
+Update dependencies
diff --git a/mysql/pyproject.toml b/mysql/pyproject.toml
@@ -38,7 +38,7 @@ license = "BSD-3-Clause"
 [project.optional-dependencies]
 deps = [
     "cachetools==3.1.1; python_version < '3.0'",
-    "cachetools==5.3.3; python_version > '3.0'",
+    "cachetools==5.4.0; python_version > '3.0'",
     "cryptography==3.3.2; python_version < '3.0'",
     "cryptography==42.0.8; python_version > '3.0'",
     "pymysql==0.10.1; python_version < '3.0'",

diff --git a/openstack_controller/changelog.d/18185.added b/openstack_controller/changelog.d/18185.added
@@ -0,0 +1 @@
+Update dependencies
diff --git a/openstack_controller/pyproject.toml b/openstack_controller/pyproject.toml
@@ -37,7 +37,7 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 deps = [
-    "openstacksdk==3.1.0; python_version > '3.0'",
+    "openstacksdk==3.3.0; python_version > '3.0'",
 ]
 
 [project.urls]

diff --git a/postgres/changelog.d/18185.added b/postgres/changelog.d/18185.added
@@ -0,0 +1 @@
+Update dependencies
diff --git a/postgres/pyproject.toml b/postgres/pyproject.toml
@@ -39,9 +39,9 @@ license = "BSD-3-Clause"
 deps = [
     "azure-identity==1.17.1; python_version > '3.0'",
     "boto3==1.17.112; python_version < '3.0'",
-    "boto3==1.34.136; python_version > '3.0'",
+    "boto3==1.34.153; python_version > '3.0'",
     "cachetools==3.1.1; python_version < '3.0'",
-    "cachetools==5.3.3; python_version > '3.0'",
+    "cachetools==5.4.0; python_version > '3.0'",
     "psycopg2-binary==2.9.9; python_version > '3.0'",
     "semver==2.13.0; python_version < '3.0'",
     "semver==3.0.2; python_version > '3.0'",

diff --git a/redisdb/changelog.d/18185.added b/redisdb/changelog.d/18185.added
@@ -0,0 +1 @@
+Update dependencies
diff --git a/redisdb/pyproject.toml b/redisdb/pyproject.toml
@@ -40,7 +40,7 @@ license = "BSD-3-Clause"
 [project.optional-dependencies]
 deps = [
     "redis==3.5.3; python_version < '3.0'",
-    "redis==5.0.7; python_version > '3.0'",
+    "redis==5.0.8; python_version > '3.0'",
 ]
 
 [project.urls]

diff --git a/snmp/changelog.d/18185.added b/snmp/changelog.d/18185.added
@@ -0,0 +1 @@
+Update dependencies
diff --git a/snmp/pyproject.toml b/snmp/pyproject.toml
@@ -44,7 +44,8 @@ deps = [
     "ply==3.11",
     "pyasn1==0.4.6",
     "pycryptodomex==3.20.0",
-    "pysmi==0.3.4",
+    "pysmi==0.3.4; python_version < '3.0'",
+    "pysmi==1.4.4; python_version > '3.0'",
     "pysnmp-mibs==0.1.6",
     "pysnmp==4.4.9",
 ]

diff --git a/snowflake/changelog.d/18185.added b/snowflake/changelog.d/18185.added
@@ -0,0 +1 @@
+Update dependencies
diff --git a/snowflake/pyproject.toml b/snowflake/pyproject.toml
@@ -37,7 +37,7 @@ license = "BSD-3-Clause"
 
 [project.optional-dependencies]
 deps = [
-    "snowflake-connector-python==3.11.0; python_version > '3.0'",
+    "snowflake-connector-python==3.12.0; python_version > '3.0'",
 ]
 
 [project.urls]

diff --git a/tls/changelog.d/18185.added b/tls/changelog.d/18185.added
@@ -0,0 +1 @@
+Update dependencies
diff --git a/vertica/changelog.d/18185.added b/vertica/changelog.d/18185.added
@@ -0,0 +1 @@
+Update dependencies
diff --git a/vertica/pyproject.toml b/vertica/pyproject.toml
@@ -40,7 +40,7 @@ license = "BSD-3-Clause"
 [project.optional-dependencies]
 deps = [
     "vertica-python==1.2.0; python_version < '3.0'",
-    "vertica-python==1.3.8; python_version > '3.0'",
+    "vertica-python==1.4.0; python_version > '3.0'",
 ]
 
 [project.urls]