From c5f9399f14de04a287ae1c438b0f6d1d4a4c25b6 Mon Sep 17 00:00:00 2001 From: Florent Clarret Date: Mon, 24 Jul 2023 11:28:21 +0200 Subject: [PATCH 1/4] Revert "Revert "Bump pydantic version in the agent_requirements.in file (#15320)" (#15338)" This reverts commit 8e72bf3387fda60db6c241a1cdea8c0cc9b26a81. --- LICENSE-3rdparty.csv | 2 +- .../datadog_checks/base/data/agent_requirements.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 5b179aba8d955..862b460f9084f 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -68,7 +68,7 @@ psycopg2-binary,PyPI,LGPL-3.0-only,Copyright (C) 2013 Federico Di Gregorio pyasn1,PyPI,BSD-3-Clause,"Copyright (c) 2005-2019, Ilya Etingof " pycryptodomex,PyPI,BSD-2-Clause,Copyright 2014 Helder Eijs pycryptodomex,PyPI,Unlicense,Helder Eijs. pycryptodomex is dedicated to the public domain under Unlicense. -pydantic,PyPI,MIT,"Copyright (c) 2017, 2018, 2019, 2020, 2021 Samuel Colvin and other contributors" +pydantic,PyPI,MIT,Copyright (c) 2017 to present Pydantic Services Inc. and individual contributors. pymongo,PyPI,Apache-2.0,Copyright 2009 The MongoDB Python Team pymqi,PyPI,PSF,Copyright (c) Zato Source s.r.o. pymysql,PyPI,MIT,"Copyright (c) 2010, 2013 PyMySQL contributors" 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 be1724f651f7f..c55956dba6026 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -60,7 +60,7 @@ psutil==5.9.0 psycopg2-binary==2.8.6; sys_platform != 'darwin' or platform_machine != 'arm64' pyasn1==0.4.6 pycryptodomex==3.10.1 -pydantic==1.10.8; python_version > '3.0' +pydantic==2.0; python_version > '3.0' pyjwt==1.7.1; python_version < '3.0' pyjwt==2.7.0; python_version > '3.0' pymongo[srv]==4.3.3; python_version >= '3.8' From a8c9f3f2d31128156e38b8b63ae98b52e76c3d1f Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Wed, 26 Jul 2023 10:23:46 -0400 Subject: [PATCH 2/4] upgrade pydantic --- .../datadog_checks/base/data/agent_requirements.in | 2 +- datadog_checks_base/pyproject.toml | 2 +- ddev/src/ddev/plugin/external/hatch/environment_collector.py | 2 +- 3 files changed, 3 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 c55956dba6026..a84b4b22d98cf 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -60,7 +60,7 @@ psutil==5.9.0 psycopg2-binary==2.8.6; sys_platform != 'darwin' or platform_machine != 'arm64' pyasn1==0.4.6 pycryptodomex==3.10.1 -pydantic==2.0; python_version > '3.0' +pydantic==2.1.1; python_version > '3.0' pyjwt==1.7.1; python_version < '3.0' pyjwt==2.7.0; python_version > '3.0' pymongo[srv]==4.3.3; python_version >= '3.8' diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index 56b78f4dbaa41..0bbbb60f61f1c 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -56,7 +56,7 @@ deps = [ "prometheus-client==0.17.0; python_version > '3.0'", "protobuf==3.17.3; python_version < '3.0'", "protobuf==3.20.2; python_version > '3.0'", - "pydantic==2.0; python_version > '3.0'", + "pydantic==2.1.1; python_version > '3.0'", "python-dateutil==2.8.2", "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", "pywin32==306; sys_platform == 'win32' and python_version > '3.0'", diff --git a/ddev/src/ddev/plugin/external/hatch/environment_collector.py b/ddev/src/ddev/plugin/external/hatch/environment_collector.py index a5ad2b14e3cd4..055d575246c59 100644 --- a/ddev/src/ddev/plugin/external/hatch/environment_collector.py +++ b/ddev/src/ddev/plugin/external/hatch/environment_collector.py @@ -120,7 +120,7 @@ def get_initial_config(self): 'black==22.12.0', 'ruff==0.0.257', # Keep in sync with: /datadog_checks_base/pyproject.toml - 'pydantic==2.0.2', + 'pydantic==2.1.1', ], } config = {'lint': lint_env} From 3f0103b9b473cc5942603574b24f5dc4d80bce54 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Wed, 26 Jul 2023 18:24:35 -0400 Subject: [PATCH 3/4] downgrade pydantic --- .../datadog_checks/base/data/agent_requirements.in | 2 +- datadog_checks_base/pyproject.toml | 2 +- ddev/src/ddev/plugin/external/hatch/environment_collector.py | 2 +- 3 files changed, 3 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 a84b4b22d98cf..847cb645a5f26 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -60,7 +60,7 @@ psutil==5.9.0 psycopg2-binary==2.8.6; sys_platform != 'darwin' or platform_machine != 'arm64' pyasn1==0.4.6 pycryptodomex==3.10.1 -pydantic==2.1.1; python_version > '3.0' +pydantic==2.0.3; python_version > '3.0' pyjwt==1.7.1; python_version < '3.0' pyjwt==2.7.0; python_version > '3.0' pymongo[srv]==4.3.3; python_version >= '3.8' diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index 0bbbb60f61f1c..60bfe40ec86e4 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -56,7 +56,7 @@ deps = [ "prometheus-client==0.17.0; python_version > '3.0'", "protobuf==3.17.3; python_version < '3.0'", "protobuf==3.20.2; python_version > '3.0'", - "pydantic==2.1.1; python_version > '3.0'", + "pydantic==2.0.3; python_version > '3.0'", "python-dateutil==2.8.2", "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", "pywin32==306; sys_platform == 'win32' and python_version > '3.0'", diff --git a/ddev/src/ddev/plugin/external/hatch/environment_collector.py b/ddev/src/ddev/plugin/external/hatch/environment_collector.py index 055d575246c59..e47bd46697db5 100644 --- a/ddev/src/ddev/plugin/external/hatch/environment_collector.py +++ b/ddev/src/ddev/plugin/external/hatch/environment_collector.py @@ -120,7 +120,7 @@ def get_initial_config(self): 'black==22.12.0', 'ruff==0.0.257', # Keep in sync with: /datadog_checks_base/pyproject.toml - 'pydantic==2.1.1', + 'pydantic==2.0.3', ], } config = {'lint': lint_env} From 1ea6296b9e25cf17a61ecc8bae8d10ecd516b8fb Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Wed, 26 Jul 2023 18:40:41 -0400 Subject: [PATCH 4/4] downgrade again --- .../datadog_checks/base/data/agent_requirements.in | 2 +- datadog_checks_base/pyproject.toml | 2 +- ddev/src/ddev/plugin/external/hatch/environment_collector.py | 2 +- 3 files changed, 3 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 847cb645a5f26..380d10c1d7bec 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -60,7 +60,7 @@ psutil==5.9.0 psycopg2-binary==2.8.6; sys_platform != 'darwin' or platform_machine != 'arm64' pyasn1==0.4.6 pycryptodomex==3.10.1 -pydantic==2.0.3; python_version > '3.0' +pydantic==2.0.2; python_version > '3.0' pyjwt==1.7.1; python_version < '3.0' pyjwt==2.7.0; python_version > '3.0' pymongo[srv]==4.3.3; python_version >= '3.8' diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index 60bfe40ec86e4..740af1b15fe3a 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -56,7 +56,7 @@ deps = [ "prometheus-client==0.17.0; python_version > '3.0'", "protobuf==3.17.3; python_version < '3.0'", "protobuf==3.20.2; python_version > '3.0'", - "pydantic==2.0.3; python_version > '3.0'", + "pydantic==2.0.2; python_version > '3.0'", "python-dateutil==2.8.2", "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", "pywin32==306; sys_platform == 'win32' and python_version > '3.0'", diff --git a/ddev/src/ddev/plugin/external/hatch/environment_collector.py b/ddev/src/ddev/plugin/external/hatch/environment_collector.py index e47bd46697db5..a5ad2b14e3cd4 100644 --- a/ddev/src/ddev/plugin/external/hatch/environment_collector.py +++ b/ddev/src/ddev/plugin/external/hatch/environment_collector.py @@ -120,7 +120,7 @@ def get_initial_config(self): 'black==22.12.0', 'ruff==0.0.257', # Keep in sync with: /datadog_checks_base/pyproject.toml - 'pydantic==2.0.3', + 'pydantic==2.0.2', ], } config = {'lint': lint_env}