diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt index c6d9afcf6ab9..ed690db69b6a 100644 --- a/lib/galaxy/dependencies/pinned-requirements.txt +++ b/lib/galaxy/dependencies/pinned-requirements.txt @@ -73,7 +73,7 @@ fsspec==2023.12.2 ; python_version >= "3.8" and python_version < "3.12" future==0.18.3 ; python_version >= "3.8" and python_version < "3.12" galaxy-sequence-utils==1.1.5 ; python_version >= "3.8" and python_version < "3.12" galaxy2cwl==0.1.4 ; python_version >= "3.8" and python_version < "3.12" -graphene-sqlalchemy==3.0.0b3 ; python_version >= "3.8" and python_version < "3.12" +graphene-sqlalchemy==3.0.0rc1 ; python_version >= "3.8" and python_version < "3.12" graphene==3.3 ; python_version >= "3.8" and python_version < "3.12" graphql-core==3.2.3 ; python_version >= "3.8" and python_version < "3.12" graphql-relay==3.2.0 ; python_version >= "3.8" and python_version < "3.12" diff --git a/lib/tool_shed/webapp/graphql/schema.py b/lib/tool_shed/webapp/graphql/schema.py index af07fb37ebc9..65c9b58f619b 100644 --- a/lib/tool_shed/webapp/graphql/schema.py +++ b/lib/tool_shed/webapp/graphql/schema.py @@ -4,10 +4,8 @@ SQLAlchemyConnectionField, SQLAlchemyObjectType, ) -from graphene_sqlalchemy.converter import ( - convert_sqlalchemy_hybrid_property_type, - convert_sqlalchemy_type, -) +from graphene_sqlalchemy.converter import convert_sqlalchemy_type +from graphene_sqlalchemy.utils import column_type_eq from graphql import GraphQLResolveInfo from sqlalchemy.orm import scoped_session from typing_extensions import TypedDict @@ -67,12 +65,12 @@ class InfoDict(TypedDict): # Map these Galaxy-ism to Graphene for cleaner interfaces. -@convert_sqlalchemy_type.register(TrimmedString) +@convert_sqlalchemy_type.register(column_type_eq(TrimmedString)) def convert_sqlalchemy_type_trimmed_string(*args, **kwd): return graphene.String -@convert_sqlalchemy_hybrid_property_type.register(lambda t: t == TrimmedString) +@convert_sqlalchemy_type.register(column_type_eq(lambda t: t == TrimmedString)) def convert_sqlalchemy_hybrid_property_type_trimmed_string(arg): return graphene.String diff --git a/packages/test_driver/setup.cfg b/packages/test_driver/setup.cfg index 9268dd3eb584..444182cef8a5 100644 --- a/packages/test_driver/setup.cfg +++ b/packages/test_driver/setup.cfg @@ -39,7 +39,7 @@ install_requires = galaxy-util galaxy-web-apps pytest - graphene-sqlalchemy==3.0.0b3 # these are only needed by tool shed - which we've split out but the test driver loads + graphene-sqlalchemy==3.0.0rc1 # these are only needed by tool shed - which we've split out but the test driver loads starlette-graphene3 packages = find: python_requires = >=3.8 diff --git a/pyproject.toml b/pyproject.toml index 625d43195168..15c66880fab0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,7 +62,7 @@ fastapi-utils = "*" fs = "*" future = "*" galaxy_sequence_utils = "*" -graphene-sqlalchemy = "3.0.0b3" # need a beta release to be compat. with starlette plugin +graphene-sqlalchemy = "3.0.0rc1" # need a beta release to be compat. with starlette plugin gravity = ">=1.0.4" gunicorn = "*" gxformat2 = "*"