From 540f38ef9cc8b8fa2129357e5c1e8988c3119ed2 Mon Sep 17 00:00:00 2001 From: Vivekanand Ilango Date: Fri, 7 Jun 2024 19:04:00 +0200 Subject: [PATCH] Update pydantic to v2.7.3 in base check --- agent_requirements.in | 2 +- datadog_checks_base/changelog.d/17774.security | 1 + datadog_checks_base/pyproject.toml | 2 +- datadog_checks_dev/pyproject.toml | 2 +- ddev/src/ddev/plugin/external/hatch/environment_collector.py | 2 +- docs/developer/testing.md | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 datadog_checks_base/changelog.d/17774.security diff --git a/agent_requirements.in b/agent_requirements.in index 524555a30ffbf..31e45a6346493 100644 --- a/agent_requirements.in +++ b/agent_requirements.in @@ -61,7 +61,7 @@ psutil==5.9.0 psycopg2-binary==2.9.9; python_version > '3.0' pyasn1==0.4.6 pycryptodomex==3.20.0 -pydantic==2.0.2; python_version > '3.0' +pydantic==2.4.0; python_version > '3.0' pyjwt==1.7.1; python_version < '3.0' pyjwt==2.8.0; python_version > '3.0' pymongo[srv]==4.7.1; python_version >= '3.9' diff --git a/datadog_checks_base/changelog.d/17774.security b/datadog_checks_base/changelog.d/17774.security new file mode 100644 index 0000000000000..8419dd885ee93 --- /dev/null +++ b/datadog_checks_base/changelog.d/17774.security @@ -0,0 +1 @@ +Update pydantic to v2.7.3 in base check diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index 9fa9c4e29b499..b4f430707680f 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -55,7 +55,7 @@ deps = [ "prometheus-client==0.20.0; python_version > '3.0'", "protobuf==3.17.3; python_version < '3.0'", "protobuf==5.26.1; python_version > '3.0'", - "pydantic==2.0.2; python_version > '3.0'", + "pydantic==2.4.0; 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'", diff --git a/datadog_checks_dev/pyproject.toml b/datadog_checks_dev/pyproject.toml index 975c552a1371b..a305683ac682c 100644 --- a/datadog_checks_dev/pyproject.toml +++ b/datadog_checks_dev/pyproject.toml @@ -79,7 +79,7 @@ cli = [ "pip-tools", "pathspec>=0.10.0", "platformdirs>=2.0.0a3", - "pydantic>=2.0.2, <2.4.0", + "pydantic>=2.0.2", "pysmi>=0.3.4", "securesystemslib[crypto]==0.28.0", "semver>=2.13.0", diff --git a/ddev/src/ddev/plugin/external/hatch/environment_collector.py b/ddev/src/ddev/plugin/external/hatch/environment_collector.py index 60d2aeaa10c7d..355fbd82b9ef0 100644 --- a/ddev/src/ddev/plugin/external/hatch/environment_collector.py +++ b/ddev/src/ddev/plugin/external/hatch/environment_collector.py @@ -147,7 +147,7 @@ def get_initial_config(self): 'black==24.2.0', 'ruff==0.3.3', # Keep in sync with: /datadog_checks_base/pyproject.toml - 'pydantic==2.0.2', + 'pydantic==2.4.0', ], } config = {'lint': lint_env} diff --git a/docs/developer/testing.md b/docs/developer/testing.md index 028c44d5077df..ed74f935fda64 100644 --- a/docs/developer/testing.md +++ b/docs/developer/testing.md @@ -17,7 +17,7 @@ $ ddev test postgres -l ┃ Name ┃ Type ┃ Features ┃ Dependencies ┃ Environment variables ┃ Scripts ┃ ┡━━━━━━━━╇━━━━━━━━━╇━━━━━━━━━━╇━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━┩ │ lint │ virtual │ │ black==22.12.0 │ │ all │ -│ │ │ │ pydantic==2.0.2 │ │ fmt │ +│ │ │ │ pydantic==2.4.0 │ │ fmt │ │ │ │ │ ruff==0.0.257 │ │ style │ ├────────┼─────────┼──────────┼─────────────────┼─────────────────────────┼───────────┤ │ latest │ virtual │ deps │ │ POSTGRES_VERSION=latest │ benchmark │