diff --git a/lib/galaxy/config/config_manage.py b/lib/galaxy/config/config_manage.py index 144cb38a199..10bfd0ba105 100644 --- a/lib/galaxy/config/config_manage.py +++ b/lib/galaxy/config/config_manage.py @@ -19,7 +19,7 @@ import yaml from boltons.iterutils import remap try: - from gravity.util import settings_to_sample + from gravity.settings import settings_to_sample except ImportError: settings_to_sample = None diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt index a2f63503124..2f9a0dc0321 100644 --- a/lib/galaxy/dependencies/pinned-requirements.txt +++ b/lib/galaxy/dependencies/pinned-requirements.txt @@ -111,7 +111,7 @@ google-cloud-batch==0.20.0 google-genai==1.47.0 ; python_full_version < '3.10' google-genai==1.59.0 ; python_full_version >= '3.10' googleapis-common-protos==1.72.0 -gravity @ git+https://github.com/nsoranzo/gravity.git@7c5f457424658ee904694f5566e61b562bce7ed6 +gravity==1.2.0 greenlet==3.2.4 ; (python_full_version < '3.10' and platform_machine == 'AMD64') or (python_full_version < '3.10' and platform_machine == 'WIN32') or (python_full_version < '3.10' and platform_machine == 'aarch64') or (python_full_version < '3.10' and platform_machine == 'amd64') or (python_full_version < '3.10' and platform_machine == 'ppc64le') or (python_full_version < '3.10' and platform_machine == 'win32') or (python_full_version < '3.10' and platform_machine == 'x86_64') greenlet==3.3.0 ; (python_full_version >= '3.10' and platform_machine == 'AMD64') or (python_full_version >= '3.10' and platform_machine == 'WIN32') or (python_full_version >= '3.10' and platform_machine == 'aarch64') or (python_full_version >= '3.10' and platform_machine == 'amd64') or (python_full_version >= '3.10' and platform_machine == 'ppc64le') or (python_full_version >= '3.10' and platform_machine == 'win32') or (python_full_version >= '3.10' and platform_machine == 'x86_64') griffe==1.14.0 ; python_full_version < '3.10' diff --git a/packages/config/setup.cfg b/packages/config/setup.cfg index b14aa426151..420b54a80ba 100644 --- a/packages/config/setup.cfg +++ b/packages/config/setup.cfg @@ -44,7 +44,7 @@ python_requires = >=3.9 [options.extras_require] test = pytest - gravity @ git+https://github.com/nsoranzo/gravity.git@python3.14 + gravity>=1.2.0 [options.entry_points] console_scripts = diff --git a/pyproject.toml b/pyproject.toml index 22254a0f480..ba6c1842475 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ dependencies = [ "fissix", "fs", "future>=1.0.0", # Python 3.12 support - "gravity @ git+https://github.com/nsoranzo/gravity.git@python3.14", # Python 3.14 support + "gravity>=1.2.0", # Python 3.14 support "gunicorn", "gxformat2>=0.21.0", "h5grove>=1.2.1",