Simplify imports

lib/galaxy/auth/providers/alwaysreject.py

@@ -5,7 +5,7 @@ Created on 16/07/2014
 """
 import logging
 
-from ..providers import AuthProvider
+from . import AuthProvider
 
 log = logging.getLogger(__name__)
 

lib/galaxy/auth/providers/ldap_ad.py

@@ -12,7 +12,7 @@ from galaxy.util import (
     string_as_bool,
     unicodify,
 )
-from ..providers import AuthProvider
+from . import AuthProvider
 
 try:
     import ldap

lib/galaxy/auth/providers/localdb.py

@@ -5,7 +5,7 @@ Created on 16/07/2014
 """
 import logging
 
-from ..providers import AuthProvider
+from . import AuthProvider
 
 log = logging.getLogger(__name__)
 

lib/galaxy/auth/providers/pam_auth.py

@@ -10,7 +10,7 @@ from galaxy.util import (
     commands,
     string_as_bool,
 )
-from ..providers import AuthProvider
+from . import AuthProvider
 
 log = logging.getLogger(__name__)
 

lib/galaxy/authnz/custos_authnz.py

@@ -23,7 +23,7 @@ from galaxy.model import (
     User,
 )
 from galaxy.model.orm.util import add_object_to_object_session
-from ..authnz import IdentityProvider
+from . import IdentityProvider
 
 try:
     import pkce

lib/galaxy/authnz/psa_authnz.py

@@ -15,15 +15,15 @@ from social_core.utils import (
 from sqlalchemy.exc import IntegrityError
 
 from galaxy.exceptions import MalformedContents
-from galaxy.util import DEFAULT_SOCKET_TIMEOUT
-from ..authnz import IdentityProvider
-from ..model import (
+from galaxy.model import (
     PSAAssociation,
     PSACode,
     PSANonce,
     PSAPartial,
     UserAuthnzToken,
 )
+from galaxy.util import DEFAULT_SOCKET_TIMEOUT
+from . import IdentityProvider
 
 # key: a component name which PSA requests.
 # value: is the name of a class associated with that key.

lib/galaxy/exceptions/__init__.py

@@ -16,7 +16,7 @@ have nothing to do with the web - keep this in mind when defining exception name
 and messages.
 """
 
-from ..exceptions.error_codes import (
+from .error_codes import (
     error_codes_by_name,
     ErrorCode,
 )

lib/galaxy/files/sources/_pyfilesystem2.py

@@ -14,7 +14,7 @@ from typing import (
 import fs
 from fs.base import FS
 
-from ..sources import BaseFilesSource
+from . import BaseFilesSource
 
 log = logging.getLogger(__name__)
 

lib/galaxy/files/sources/posix.py

@@ -13,7 +13,7 @@ from galaxy.util.path import (
     safe_path,
     safe_walk,
 )
-from ..sources import BaseFilesSource
+from . import BaseFilesSource
 
 DEFAULT_ENFORCE_SYMLINK_SECURITY = True
 DEFAULT_DELETE_ON_REALIZE = False

lib/galaxy/files/sources/s3fs.py

@@ -12,7 +12,7 @@ try:
 except ImportError:
     s3fs = None
 
-from ..sources import BaseFilesSource
+from . import BaseFilesSource
 
 DEFAULT_ENFORCE_SYMLINK_SECURITY = True
 DEFAULT_DELETE_ON_REALIZE = False

lib/galaxy/job_metrics/__init__.py

@@ -27,11 +27,11 @@ from typing import (
 
 from galaxy import util
 from galaxy.util import plugin_config
+from . import formatting
 from .safety import (
     DEFAULT_SAFETY,
     Safety,
 )
-from ..job_metrics import formatting
 
 log = logging.getLogger(__name__)
 

lib/galaxy/jobs/runners/util/cli/job/lsf.py

@@ -3,7 +3,7 @@
 from logging import getLogger
 from os import path
 
-from ..job import (
+from . import (
     BaseJobExec,
     job_states,
 )

lib/galaxy/jobs/runners/util/cli/job/slurm.py

@@ -2,7 +2,7 @@
 # non-submit host and using a Slurm cluster.
 from logging import getLogger
 
-from ..job import (
+from . import (
     BaseJobExec,
     job_states,
 )

lib/galaxy/jobs/runners/util/cli/job/torque.py

@@ -1,7 +1,7 @@
 from logging import getLogger
 
 from galaxy.util import parse_xml_string
-from ..job import (
+from . import (
     BaseJobExec,
     job_states,
 )

lib/galaxy/model/dataset_collections/types/list.py

@@ -1,5 +1,5 @@
 from galaxy.model import DatasetCollectionElement
-from ..types import BaseDatasetCollectionType
+from . import BaseDatasetCollectionType
 
 
 class ListDatasetCollectionType(BaseDatasetCollectionType):

lib/galaxy/model/dataset_collections/types/paired.py

@@ -2,7 +2,7 @@ from galaxy.model import (
     DatasetCollectionElement,
     HistoryDatasetAssociation,
 )
-from ..types import BaseDatasetCollectionType
+from . import BaseDatasetCollectionType
 
 FORWARD_IDENTIFIER = "forward"
 REVERSE_IDENTIFIER = "reverse"

lib/galaxy/objectstore/azure_blob.py

@@ -28,7 +28,7 @@ from galaxy.util import (
 )
 from galaxy.util.path import safe_relpath
 from galaxy.util.sleeper import Sleeper
-from ..objectstore import (
+from . import (
     ConcreteObjectStore,
     convert_bytes,
 )

lib/galaxy/objectstore/cloud.py

@@ -23,11 +23,11 @@ from galaxy.util import (
     unlink,
 )
 from galaxy.util.sleeper import Sleeper
-from .s3 import parse_config_xml
-from ..objectstore import (
+from . import (
     ConcreteObjectStore,
     convert_bytes,
 )
+from .s3 import parse_config_xml
 
 try:
     from cloudbridge.factory import (

lib/galaxy/objectstore/irods.py

@@ -30,7 +30,7 @@ from galaxy.util import (
     unlink,
 )
 from galaxy.util.path import safe_relpath
-from ..objectstore import DiskObjectStore
+from . import DiskObjectStore
 
 IRODS_IMPORT_MESSAGE = "The Python irods package is required to use this feature, please install it"
 # 1 MB

lib/galaxy/objectstore/pithos.py

@@ -26,7 +26,7 @@ from galaxy.util import (
     umask_fix_perms,
 )
 from galaxy.util.path import safe_relpath
-from ..objectstore import ConcreteObjectStore
+from . import ConcreteObjectStore
 
 NO_KAMAKI_ERROR_MESSAGE = (
     "ObjectStore configured, but no kamaki.clients dependency available."

lib/galaxy/objectstore/pulsar.py

@@ -1,4 +1,4 @@
-from ..objectstore import BaseObjectStore
+from . import BaseObjectStore
 
 try:
     from pulsar.client.manager import ObjectStoreClientManager

lib/galaxy/objectstore/s3.py

@@ -32,11 +32,11 @@ from galaxy.util import (
 )
 from galaxy.util.path import safe_relpath
 from galaxy.util.sleeper import Sleeper
-from .s3_multipart_upload import multipart_upload
-from ..objectstore import (
+from . import (
     ConcreteObjectStore,
     convert_bytes,
 )
+from .s3_multipart_upload import multipart_upload
 
 NO_BOTO_ERROR_MESSAGE = (
     "S3/Swift object store configured, but no boto dependency available."

lib/galaxy/schema/tasks.py

@@ -7,6 +7,7 @@ from pydantic import (
 )
 
 from galaxy.util.hash_util import HashFunctionNameEnum
+from . import PdfDocumentType
 from .schema import (
     BcoGenerationParametersMixin,
     DatasetSourceType,
@@ -15,7 +16,6 @@ from .schema import (
     ShortTermStoreExportPayload,
     WriteStoreToPayload,
 )
-from ..schema import PdfDocumentType
 
 
 class SetupHistoryExportJob(BaseModel):

lib/galaxy/tool_util/deps/brew_util.py

@@ -2,7 +2,7 @@
 builds on those abstraction and provides Galaxy specific functionality
 not useful to the brew external commands.
 """
-from ..deps import brew_exts
+from . import brew_exts
 
 DEFAULT_TAP = "homebrew/science"
 

lib/galaxy/tool_util/deps/container_resolvers/explicit.py

@@ -4,9 +4,9 @@ import os
 from typing import cast
 
 from galaxy.util.commands import shell
+from . import ContainerResolver
 from .mulled import CliContainerResolver
 from ..container_classes import SingularityContainer
-from ..container_resolvers import ContainerResolver
 from ..requirements import ContainerDescription
 
 log = logging.getLogger(__name__)

lib/galaxy/tool_util/locations/dockstore.py

@@ -4,7 +4,7 @@ import requests
 import yaml
 
 from galaxy.util import DEFAULT_SOCKET_TIMEOUT
-from ..locations import ToolLocationResolver
+from . import ToolLocationResolver
 
 
 class DockStoreResolver(ToolLocationResolver):

lib/galaxy/tool_util/locations/file.py

@@ -1,4 +1,4 @@
-from ..locations import ToolLocationResolver
+from . import ToolLocationResolver
 
 
 class HttpToolResolver(ToolLocationResolver):

lib/galaxy/tool_util/locations/http.py

@@ -1,5 +1,5 @@
 from galaxy.util import download_to_file
-from ..locations import ToolLocationResolver
+from . import ToolLocationResolver
 
 
 class HttpToolResolver(ToolLocationResolver):

lib/galaxy/util/json.py

@@ -11,7 +11,7 @@ from collections.abc import (
 )
 from decimal import Decimal
 
-from ..util import unicodify
+from . import unicodify
 
 __all__ = ("safe_dumps", "validate_jsonrpc_request", "validate_jsonrpc_response", "jsonrpc_request", "jsonrpc_response")
 

lib/galaxy/workflow/reports/generators/markdown.py

@@ -3,7 +3,7 @@
 import logging
 import string
 
-from ..generators import WorkflowMarkdownGeneratorPlugin
+from . import WorkflowMarkdownGeneratorPlugin
 
 log = logging.getLogger(__name__)
 

lib/galaxy/workflow/schedulers/core.py

@@ -9,7 +9,7 @@ from galaxy.workflow import (
     run,
     run_request,
 )
-from ..schedulers import ActiveWorkflowSchedulingPlugin
+from . import ActiveWorkflowSchedulingPlugin
 
 if TYPE_CHECKING:
     from galaxy.model import WorkflowInvocation