diff --git a/lib/galaxy/objectstore/azure_blob.py b/lib/galaxy/objectstore/azure_blob.py index 7ffada436f15..d370f460ccb9 100644 --- a/lib/galaxy/objectstore/azure_blob.py +++ b/lib/galaxy/objectstore/azure_blob.py @@ -4,7 +4,6 @@ import logging import os -import shutil from datetime import ( datetime, timedelta, @@ -21,17 +20,7 @@ except ImportError: BlobServiceClient = None -from galaxy.exceptions import ( - ObjectInvalid, - ObjectNotFound, -) -from galaxy.util import ( - directory_hash_id, - unlink, -) -from galaxy.util.path import safe_relpath from . import ConcreteObjectStore -from ._util import fix_permissions from .caching import ( CacheTarget, enable_cache_monitor, diff --git a/lib/galaxy/objectstore/cloud.py b/lib/galaxy/objectstore/cloud.py index ac596131d655..3565b747d3ef 100644 --- a/lib/galaxy/objectstore/cloud.py +++ b/lib/galaxy/objectstore/cloud.py @@ -6,22 +6,11 @@ import multiprocessing import os import os.path -import shutil import subprocess from datetime import datetime from typing import Optional -from galaxy.exceptions import ( - ObjectInvalid, - ObjectNotFound, -) -from galaxy.util import ( - directory_hash_id, - safe_relpath, - unlink, -) from . import ConcreteObjectStore -from ._util import fix_permissions from .caching import ( CacheTarget, enable_cache_monitor, diff --git a/lib/galaxy/objectstore/irods.py b/lib/galaxy/objectstore/irods.py index c92ff5651317..9ac626f6f32c 100644 --- a/lib/galaxy/objectstore/irods.py +++ b/lib/galaxy/objectstore/irods.py @@ -20,20 +20,14 @@ except ImportError: irods = None -from galaxy.exceptions import ( - ObjectInvalid, - ObjectNotFound, -) from galaxy.util import ( directory_hash_id, ExecutionTimer, string_as_bool, - umask_fix_perms, unlink, ) from galaxy.util.path import safe_relpath from . import DiskObjectStore -from ._util import fix_permissions from .caching import UsesCache IRODS_IMPORT_MESSAGE = "The Python irods package is required to use this feature, please install it" diff --git a/lib/galaxy/objectstore/pithos.py b/lib/galaxy/objectstore/pithos.py index d04f1b354a10..2ba74636ac2b 100644 --- a/lib/galaxy/objectstore/pithos.py +++ b/lib/galaxy/objectstore/pithos.py @@ -4,7 +4,6 @@ import logging import os -import shutil try: from kamaki.clients import ( @@ -17,17 +16,8 @@ except ImportError: KamakiClient = None -from galaxy.exceptions import ( - ObjectInvalid, - ObjectNotFound, -) -from galaxy.util import ( - directory_hash_id, - umask_fix_perms, -) -from galaxy.util.path import safe_relpath +from galaxy.util import directory_hash_id from . import ConcreteObjectStore -from ._util import fix_permissions from .caching import UsesCache NO_KAMAKI_ERROR_MESSAGE = ( diff --git a/lib/galaxy/objectstore/rucio.py b/lib/galaxy/objectstore/rucio.py index d371e89d3746..874aa3564f4a 100644 --- a/lib/galaxy/objectstore/rucio.py +++ b/lib/galaxy/objectstore/rucio.py @@ -32,7 +32,6 @@ umask_fix_perms, unlink, ) -from galaxy.util.path import safe_relpath from . import ConcreteObjectStore from .caching import ( CacheTarget, diff --git a/lib/galaxy/objectstore/s3.py b/lib/galaxy/objectstore/s3.py index 48b640732f02..316454740d52 100644 --- a/lib/galaxy/objectstore/s3.py +++ b/lib/galaxy/objectstore/s3.py @@ -5,7 +5,6 @@ import logging import multiprocessing import os -import shutil import subprocess import time from datetime import datetime @@ -20,19 +19,11 @@ except ImportError: boto = None # type: ignore[assignment] -from galaxy.exceptions import ( - ObjectInvalid, - ObjectNotFound, -) from galaxy.util import ( - directory_hash_id, string_as_bool, - unlink, which, ) -from galaxy.util.path import safe_relpath from . import ConcreteObjectStore -from ._util import fix_permissions from .caching import ( CacheTarget, enable_cache_monitor,