diff --git a/lib/galaxy/config/__init__.py b/lib/galaxy/config/__init__.py index 574676f264bc..2cc29a027431 100644 --- a/lib/galaxy/config/__init__.py +++ b/lib/galaxy/config/__init__.py @@ -33,7 +33,6 @@ import yaml -from galaxy.config.parsers import parse_allowlist_ips from galaxy.config.schema import AppSchema from galaxy.exceptions import ConfigurationError from galaxy.util import ( @@ -42,6 +41,7 @@ string_as_bool, unicodify, ) +from galaxy.util.config_parsers import parse_allowlist_ips from galaxy.util.custom_logging import LOGLV_TRACE from galaxy.util.dynamic import HasDynamicProperties from galaxy.util.facts import get_facts diff --git a/lib/galaxy/files/__init__.py b/lib/galaxy/files/__init__.py index 736358866e98..01a4e46cd6be 100644 --- a/lib/galaxy/files/__init__.py +++ b/lib/galaxy/files/__init__.py @@ -13,8 +13,8 @@ ) from galaxy import exceptions -from galaxy.config.parsers import parse_allowlist_ips from galaxy.util import plugin_config +from galaxy.util.config_parsers import parse_allowlist_ips from galaxy.util.dictifiable import Dictifiable log = logging.getLogger(__name__) diff --git a/lib/galaxy/files/uris.py b/lib/galaxy/files/uris.py index d6240fd4ce1b..139b09f391fd 100644 --- a/lib/galaxy/files/uris.py +++ b/lib/galaxy/files/uris.py @@ -9,7 +9,6 @@ ) from urllib.parse import urlparse -from galaxy.config.parsers import IpAllowedListEntryT from galaxy.exceptions import ( AdminRequiredException, ConfigDoesNotAllowException, @@ -23,6 +22,7 @@ stream_to_open_named_file, unicodify, ) +from galaxy.util.config_parsers import IpAllowedListEntryT log = logging.getLogger(__name__) diff --git a/lib/galaxy/config/parsers.py b/lib/galaxy/util/config_parsers.py similarity index 100% rename from lib/galaxy/config/parsers.py rename to lib/galaxy/util/config_parsers.py diff --git a/lib/galaxy_test/api/test_drs.py b/lib/galaxy_test/api/test_drs.py index 0fa0e1015729..20c4879d62f6 100644 --- a/lib/galaxy_test/api/test_drs.py +++ b/lib/galaxy_test/api/test_drs.py @@ -11,12 +11,12 @@ import requests -from galaxy.config.parsers import parse_allowlist_ips from galaxy.files import ( ConfiguredFileSources, ConfiguredFileSourcesConfig, DictFileSourcesUserContext, ) +from galaxy.util.config_parsers import parse_allowlist_ips from galaxy.util.drs import ( fetch_drs_to_file, RetryOptions,