From 621c517860ba33a396045a3ca9e027ab39e6bde7 Mon Sep 17 00:00:00 2001 From: Guillaume Belanger Date: Tue, 27 Feb 2024 08:41:52 -0500 Subject: [PATCH 1/5] chore: bump pydantic to v2.5.3 --- requirements.in | 2 +- requirements.txt | 11 ++++++++--- test-requirements.in | 1 + test-requirements.txt | 16 +++++++++++----- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/requirements.in b/requirements.in index 2a91e02..85ab7b4 100644 --- a/requirements.in +++ b/requirements.in @@ -1,7 +1,7 @@ ops lightkube lightkube-models -pydantic<2.0 +pydantic==2.5.3 pytest-interface-tester jinja2 jsonschema diff --git a/requirements.txt b/requirements.txt index 04348a2..07db5ba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,8 @@ # # pip-compile requirements.in # +annotated-types==0.6.0 + # via pydantic anyio==4.3.0 # via httpx attrs==23.2.0 @@ -61,10 +63,12 @@ pluggy==1.4.0 # via pytest pycparser==2.21 # via cffi -pydantic==1.10.14 +pydantic==2.5.3 # via # -r requirements.in # pytest-interface-tester +pydantic-core==2.14.6 + # via pydantic pytest==8.0.2 # via pytest-interface-tester pytest-interface-tester==2.0.1 @@ -83,15 +87,16 @@ rpds-py==0.18.0 # via # jsonschema # referencing -sniffio==1.3.0 +sniffio==1.3.1 # via # anyio # httpx typer==0.7.0 # via pytest-interface-tester -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via # cosl # pydantic + # pydantic-core websocket-client==1.7.0 # via ops diff --git a/test-requirements.in b/test-requirements.in index 1468c6c..5b799e3 100644 --- a/test-requirements.in +++ b/test-requirements.in @@ -7,6 +7,7 @@ juju==3.3.1.1 macaroonbakery==1.3.4 # https://protobuf.dev/news/2022-05-06/#python-updates mypy pep8-naming +pydantic==2.5.3 pyproject-flake8 pytest pytest-operator diff --git a/test-requirements.txt b/test-requirements.txt index ba86215..58e6346 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,13 +4,15 @@ # # pip-compile test-requirements.in # +annotated-types==0.6.0 + # via pydantic asttokens==2.4.1 # via stack-data bcrypt==4.1.2 # via paramiko black==24.2.0 # via -r test-requirements.in -cachetools==5.3.2 +cachetools==5.3.3 # via google-auth certifi==2024.2.2 # via @@ -25,9 +27,7 @@ charset-normalizer==3.3.2 click==8.1.7 # via black coverage[toml]==7.4.3 - # via - # -r test-requirements.in - # coverage + # via -r test-requirements.in cryptography==42.0.5 # via paramiko decorator==5.1.1 @@ -129,6 +129,10 @@ pycodestyle==2.11.1 # via flake8 pycparser==2.21 # via cffi +pydantic==2.5.3 + # via -r test-requirements.in +pydantic-core==2.14.6 + # via pydantic pydocstyle==6.3.0 # via flake8-docstrings pyflakes==3.1.0 @@ -199,9 +203,11 @@ types-setuptools==69.1.0.20240223 # via -r test-requirements.in types-toml==0.10.8.7 # via -r test-requirements.in -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via # mypy + # pydantic + # pydantic-core # typing-inspect typing-inspect==0.9.0 # via juju From e7780de2eda2caf46e9ac56e348e20a30a096036 Mon Sep 17 00:00:00 2001 From: Guillaume Belanger Date: Tue, 27 Feb 2024 11:18:44 -0500 Subject: [PATCH 2/5] remove changes from test requirements --- test-requirements.in | 1 - test-requirements.txt | 8 -------- 2 files changed, 9 deletions(-) diff --git a/test-requirements.in b/test-requirements.in index 5b799e3..1468c6c 100644 --- a/test-requirements.in +++ b/test-requirements.in @@ -7,7 +7,6 @@ juju==3.3.1.1 macaroonbakery==1.3.4 # https://protobuf.dev/news/2022-05-06/#python-updates mypy pep8-naming -pydantic==2.5.3 pyproject-flake8 pytest pytest-operator diff --git a/test-requirements.txt b/test-requirements.txt index 58e6346..0425f9d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,8 +4,6 @@ # # pip-compile test-requirements.in # -annotated-types==0.6.0 - # via pydantic asttokens==2.4.1 # via stack-data bcrypt==4.1.2 @@ -129,10 +127,6 @@ pycodestyle==2.11.1 # via flake8 pycparser==2.21 # via cffi -pydantic==2.5.3 - # via -r test-requirements.in -pydantic-core==2.14.6 - # via pydantic pydocstyle==6.3.0 # via flake8-docstrings pyflakes==3.1.0 @@ -206,8 +200,6 @@ types-toml==0.10.8.7 typing-extensions==4.10.0 # via # mypy - # pydantic - # pydantic-core # typing-inspect typing-inspect==0.9.0 # via juju From e26920d121d21ad1961f729f8eb4fb67fa9261e1 Mon Sep 17 00:00:00 2001 From: Guillaume Belanger Date: Tue, 27 Feb 2024 11:19:20 -0500 Subject: [PATCH 3/5] remove changes from test requirements --- test-requirements.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 0425f9d..f756dc4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,7 +10,7 @@ bcrypt==4.1.2 # via paramiko black==24.2.0 # via -r test-requirements.in -cachetools==5.3.3 +cachetools==5.3.2 # via google-auth certifi==2024.2.2 # via @@ -25,7 +25,9 @@ charset-normalizer==3.3.2 click==8.1.7 # via black coverage[toml]==7.4.3 - # via -r test-requirements.in + # via + # -r test-requirements.in + # coverage cryptography==42.0.5 # via paramiko decorator==5.1.1 @@ -197,7 +199,7 @@ types-setuptools==69.1.0.20240223 # via -r test-requirements.in types-toml==0.10.8.7 # via -r test-requirements.in -typing-extensions==4.10.0 +typing-extensions==4.9.0 # via # mypy # typing-inspect @@ -212,4 +214,4 @@ wcwidth==0.2.13 websocket-client==1.7.0 # via kubernetes websockets==12.0 - # via juju + # via juju \ No newline at end of file From 529463724e6d38b322882026b219d4c6bec2371f Mon Sep 17 00:00:00 2001 From: Guillaume Belanger Date: Tue, 27 Feb 2024 11:20:05 -0500 Subject: [PATCH 4/5] remove changes from test requirements --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index f756dc4..ba86215 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -214,4 +214,4 @@ wcwidth==0.2.13 websocket-client==1.7.0 # via kubernetes websockets==12.0 - # via juju \ No newline at end of file + # via juju From cd7a277a24a025f8568f6e14699f75e525fd0e4e Mon Sep 17 00:00:00 2001 From: Guillaume Belanger Date: Tue, 27 Feb 2024 11:23:29 -0500 Subject: [PATCH 5/5] revert change to typing extensions --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 07db5ba..403f0de 100644 --- a/requirements.txt +++ b/requirements.txt @@ -93,7 +93,7 @@ sniffio==1.3.1 # httpx typer==0.7.0 # via pytest-interface-tester -typing-extensions==4.10.0 +typing-extensions==4.9.0 # via # cosl # pydantic