From ab1e0485d7e6a64db982e1380a8eae59f2685f28 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Fri, 30 Jun 2023 14:51:18 -0400 Subject: [PATCH] Pin pydantic in packages to <2 --- packages/app/setup.cfg | 4 ++-- packages/data/setup.cfg | 4 ++-- packages/tool_util/setup.cfg | 4 ++-- packages/tours/setup.cfg | 4 ++-- packages/web_apps/setup.cfg | 4 ++-- packages/web_framework/setup.cfg | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/app/setup.cfg b/packages/app/setup.cfg index f5dc094b5b1..0505bfaf21f 100644 --- 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* \ No newline at end of file + tests* diff --git a/packages/data/setup.cfg b/packages/data/setup.cfg index 4ee9b38f9bb..4b1f021158b 100644 --- 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* \ No newline at end of file + tests* diff --git a/packages/tool_util/setup.cfg b/packages/tool_util/setup.cfg index 4302d28dfed..3902bf2c6be 100644 --- 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* \ No newline at end of file + tests* diff --git a/packages/tours/setup.cfg b/packages/tours/setup.cfg index b6f9d3d3703..aad582f3c79 100644 --- 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* \ No newline at end of file + tests* diff --git a/packages/web_apps/setup.cfg b/packages/web_apps/setup.cfg index 3ca8ea33bf3..615e5b4bdb4 100644 --- a/packages/web_apps/setup.cfg +++ b/packages/web_apps/setup.cfg @@ -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* \ No newline at end of file + tool_shed.test* diff --git a/packages/web_framework/setup.cfg b/packages/web_framework/setup.cfg index 3b1eb6e17a3..02ef6a823a9 100644 --- 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* \ No newline at end of file + tests*