Merge pull request #16354 from natefoo/packages-pin-pydantic

[23.0] Pin pydantic in packages to <2
galaxyproject · Jun 30, 2023 · 34e7580 · 34e7580
2 parents 9893cb3 + 492b2ee
commit 34e7580
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 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
+    pydantic<2
     pysam>=0.20
     PyJWT
     PyYAML
@@ -84,4 +84,4 @@ console_scripts =
 [options.packages.find]
 exclude =
     galaxy.tools.bundled*
-    tests*
+    tests*
diff --git a/packages/data/setup.cfg b/packages/data/setup.cfg
@@ -47,7 +47,7 @@ install_requires =
     numpy
     parsley
     pycryptodome
-    pydantic[email]
+    pydantic[email]<2
     pylibmagic
     python-magic
     pysam>=0.20
@@ -68,4 +68,4 @@ console_scripts =
 
 [options.packages.find]
 exclude =
-    tests*
+    tests*
diff --git a/packages/tool_util/setup.cfg b/packages/tool_util/setup.cfg
@@ -37,7 +37,7 @@ install_requires =
     lxml
     MarkupSafe
     packaging<22
-    pydantic
+    pydantic<2
     PyYAML
     requests
     sortedcontainers
@@ -68,4 +68,4 @@ edam =
 
 [options.packages.find]
 exclude =
-    tests*
+    tests*
diff --git a/packages/tours/setup.cfg b/packages/tours/setup.cfg
@@ -33,7 +33,7 @@ version = 23.0.4.dev0
 include_package_data = True
 install_requires =
     galaxy-navigation
-    pydantic
+    pydantic<2
     PyYAML
 packages = find:
 python_requires = >=3.7
@@ -44,4 +44,4 @@ console_scripts =
 
 [options.packages.find]
 exclude =
-    tests*
+    tests*
diff --git a/packages/web_apps/setup.cfg b/packages/web_apps/setup.cfg
@@ -42,7 +42,7 @@ install_requires =
     apispec
     Babel
     Cheetah3
-    fastapi>=0.68.2,!=0.69.0,!=0.70.0,!=0.70.1
+    fastapi>=0.68.2,!=0.69.0,!=0.70.0,!=0.70.1,<0.99
     fastapi-utils
     gunicorn
     gxformat2
@@ -51,7 +51,7 @@ install_requires =
     MarkupSafe
     mercurial
     Paste
-    pydantic
+    pydantic<2
     PyJWT
     python-dateutil
     python-multipart  # required to support form parsing in FastAPI/Starlette
@@ -74,4 +74,4 @@ python_requires = >=3.7
 [options.packages.find]
 exclude =
     tests*
-    tool_shed.test*
+    tool_shed.test*
diff --git a/packages/web_framework/setup.cfg b/packages/web_framework/setup.cfg
@@ -38,7 +38,7 @@ install_requires =
     babel
     MarkupSafe
     paste
-    pydantic
+    pydantic<2
     requests
     Routes
     SQLAlchemy>=1.4.25,<2
@@ -49,4 +49,4 @@ python_requires = >=3.7
 
 [options.packages.find]
 exclude =
-    tests*
+    tests*
diff --git a/pyproject.toml b/pyproject.toml
@@ -51,7 +51,7 @@ dictobj = "*"
 dnspython = "*"
 docutils = "!=0.17, !=0.17.1"
 edam-ontology = "*"
-fastapi = ">=0.71.0, !=0.89.0"  # https://github.com/tiangolo/fastapi/issues/4041 https://github.com/tiangolo/fastapi/issues/5861
+fastapi = ">=0.71.0, !=0.89.0, <0.99"  # https://github.com/tiangolo/fastapi/issues/4041 https://github.com/tiangolo/fastapi/issues/5861
 fastapi-utils = "*"
 fs = "*"
 future = "*"
@@ -80,7 +80,7 @@ pebble = "*"
 psutil = "*"
 pulsar-galaxy-lib = ">=0.15.0.dev0"
 pycryptodome = "*"
-pydantic = {version = "*", extras = ["email"]}
+pydantic = {version = "<2", extras = ["email"]}
 PyJWT = "*"
 pykwalify = "*"
 pylibmagic = "*"