Disallow pydantic 2.6.0 and 2.6.1

xref: pydantic/pydantic#8760 Fix the following error when testing with mypy: ``` $ tox -e mypy Deferral trace: cwltool.utils:62 cwltool.utils:-1 ... galaxy.model:666 galaxy.model:666 galaxy.model:666 galaxy.model:666 lib/galaxy/model/__init__.py: error: INTERNAL ERROR: maximum semantic analysis iteration count reached Found 1 error in 1 file (errors prevented further checking) ```
galaxyproject · Feb 12, 2024 · d8f076c · d8f076c
1 parent 818c147
commit d8f076c
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/packages/app/setup.cfg b/packages/app/setup.cfg
@@ -61,7 +61,7 @@ install_requires =
     paramiko!=2.9.0,!=2.9.1
     pebble
     pulsar-galaxy-lib>=0.15.0.dev0
-    pydantic>=2
+    pydantic>=2,!=2.6.0,!=2.6.1
     pysam>=0.21
     PyJWT
     PyYAML

diff --git a/packages/data/setup.cfg b/packages/data/setup.cfg
@@ -51,7 +51,7 @@ install_requires =
     numpy
     parsley
     pycryptodome
-    pydantic[email]>=2
+    pydantic[email]>=2,!=2.6.0,!=2.6.1
     pylibmagic
     python-magic
     pysam>=0.21

diff --git a/packages/objectstore/setup.cfg b/packages/objectstore/setup.cfg
@@ -34,7 +34,7 @@ version = 23.2.dev0
 include_package_data = True
 install_requires =
     galaxy-util
-    pydantic>=2
+    pydantic>=2,!=2.6.0,!=2.6.1
     PyYAML
 packages = find:
 python_requires = >=3.7

diff --git a/packages/schema/setup.cfg b/packages/schema/setup.cfg
@@ -33,7 +33,7 @@ version = 23.2.dev0
 include_package_data = True
 install_requires =
     galaxy-util
-    pydantic[email]>=2
+    pydantic[email]>=2,!=2.6.0,!=2.6.1
 packages = find:
 python_requires = >=3.8
 

diff --git a/packages/tool_util/setup.cfg b/packages/tool_util/setup.cfg
@@ -38,7 +38,7 @@ install_requires =
     lxml!=4.2.2
     MarkupSafe
     packaging
-    pydantic>=2
+    pydantic>=2,!=2.6.0,!=2.6.1
     PyYAML
     requests
     sortedcontainers

diff --git a/packages/tours/setup.cfg b/packages/tours/setup.cfg
@@ -33,7 +33,7 @@ version = 23.2.dev0
 include_package_data = True
 install_requires =
     galaxy-navigation
-    pydantic>=2
+    pydantic>=2,!=2.6.0,!=2.6.1
     PyYAML
 packages = find:
 python_requires = >=3.8

diff --git a/packages/web_apps/setup.cfg b/packages/web_apps/setup.cfg
@@ -51,7 +51,7 @@ install_requires =
     MarkupSafe
     mercurial
     Paste
-    pydantic>=2
+    pydantic>=2,!=2.6.0,!=2.6.1
     PyJWT
     python-dateutil
     python-multipart  # required to support form parsing in FastAPI/Starlette

diff --git a/packages/web_framework/setup.cfg b/packages/web_framework/setup.cfg
@@ -37,7 +37,7 @@ install_requires =
     babel
     MarkupSafe
     paste
-    pydantic>=2
+    pydantic>=2,!=2.6.0,!=2.6.1
     requests
     Routes
     SQLAlchemy>=1.4.25,<2

diff --git a/pyproject.toml b/pyproject.toml
@@ -88,7 +88,7 @@ pebble = "*"
 psutil = "*"
 pulsar-galaxy-lib = ">=0.15.0.dev0"
 pycryptodome = "*"
-pydantic = {version = ">=2", extras = ["email"]}
+pydantic = {version = ">=2, !=2.6.0, !=2.6.1", extras = ["email"]}  # https://github.com/pydantic/pydantic/issues/8760
 PyJWT = "*"
 pykwalify = "*"
 pylibmagic = "*"
@@ -168,7 +168,7 @@ Werkzeug = "*"
 [tool.poetry.group.typecheck.dependencies]
 mypy = "*"
 lxml-stubs = "*"
-pydantic = ">=2"  # for pydantic.mypy plugin
+pydantic = ">=2, !=2.6.0, !=2.6.1"  # for pydantic.mypy plugin
 types-bleach = "*"
 types-boto = "*"
 types-contextvars = "*"