From b0bbd2a1ebe512f9ace223e73688c16b44d116d5 Mon Sep 17 00:00:00 2001
From: Andreas Maier <maiera@de.ibm.com>
Date: Thu, 24 Oct 2024 13:13:31 +0200
Subject: [PATCH] Fixed pydantic-core install failure

Signed-off-by: Andreas Maier <maiera@de.ibm.com>
---
 .github/workflows/test.yml      | 5 +++++
 minimum-constraints-develop.txt | 7 +++----
 minimum-constraints-install.txt | 2 +-
 requirements-develop.txt        | 9 ++++++---
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4707f41..97dfee2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -54,6 +54,11 @@ jobs:
                 \"python-version\": \"3.9\", \
                 \"package_level\": \"latest\" \
               }, \
+              { \
+                \"os\": \"ubuntu-latest\", \
+                \"python-version\": \"3.12\", \
+                \"package_level\": \"latest\" \
+              }, \
               { \
                 \"os\": \"macos-latest\", \
                 \"python-version\": \"3.9\", \
diff --git a/minimum-constraints-develop.txt b/minimum-constraints-develop.txt
index 5b770f0..a8263f2 100644
--- a/minimum-constraints-develop.txt
+++ b/minimum-constraints-develop.txt
@@ -77,15 +77,15 @@ incremental==22.10.0
 click-default-group==1.2.4
 
 # Safety tool
-safety==3.0.1
-safety-schemas==0.0.1
+safety==3.1.0
+safety-schemas==0.0.2
 # TODO: Change to dparse 0.6.4 once released
 dparse==0.6.4b0
 ruamel.yaml==0.17.21
 click==8.0.2
 Authlib==1.3.1
 marshmallow==3.15.0
-pydantic==1.10.13
+pydantic==2.8.0
 typer==0.12.0
 typer-cli==0.12.0
 typer-slim==0.12.0
@@ -134,5 +134,4 @@ toml==0.10.2
 tomli==2.0.1
 tqdm==4.66.4
 typing==3.6.1
-typing-extensions==4.7.1
 urllib3==1.26.19
diff --git a/minimum-constraints-install.txt b/minimum-constraints-install.txt
index 402b213..901879e 100644
--- a/minimum-constraints-install.txt
+++ b/minimum-constraints-install.txt
@@ -54,7 +54,7 @@ pyrsistent==0.20.0
 pytz==2024.1
 six==1.16.0
 stomp.py==8.1.2
-typing_extensions==4.7.1
+typing-extensions==4.12.2
 websocket-client==1.8.0
 yamlloader==1.4.1
 zipp==3.19.1
diff --git a/requirements-develop.txt b/requirements-develop.txt
index 2c38777..a7d3ea9 100644
--- a/requirements-develop.txt
+++ b/requirements-develop.txt
@@ -83,15 +83,18 @@ ruff>=0.3.5
 towncrier>=22.8.0
 
 # Safety tool
-safety>=3.0.1
-safety-schemas>=0.0.1
+# Safety 3.0.0 requires exact versions of authlib==1.2.0 and jwt==1.3.1.
+# Safety 3.0.x pins pydantic to <2.0, preventing bug fixes.
+# pydantic 2.8.0 fixes an install issue on Python 3.13.
+safety>=3.1.0
+safety-schemas>=0.0.2,!=0.0.7
 # TODO: Change to dparse 0.6.4 once released
 dparse>=0.6.4b0
 ruamel.yaml>=0.17.21
 click>=8.0.2
 Authlib>=1.3.1
 marshmallow>=3.15.0
-pydantic>=1.10.13
+pydantic>=2.8.0
 typer>=0.12.0
 typer-cli>=0.12.0
 typer-slim>=0.12.0