diff --git a/lib/galaxy/celery/tasks.py b/lib/galaxy/celery/tasks.py index 8a4f2c1b0aa..53f84b57f12 100644 --- a/lib/galaxy/celery/tasks.py +++ b/lib/galaxy/celery/tasks.py @@ -53,7 +53,7 @@ from galaxy.model import ( Job, User, ) -from galaxy.model.orm.now import now +from galaxy.util import now from galaxy.model.scoped_session import galaxy_scoped_session from galaxy.objectstore import BaseObjectStore from galaxy.objectstore.caching import check_caches diff --git a/lib/galaxy/managers/credentials.py b/lib/galaxy/managers/credentials.py index 561dd7df95f..90ed4c73ede 100644 --- a/lib/galaxy/managers/credentials.py +++ b/lib/galaxy/managers/credentials.py @@ -15,7 +15,7 @@ from galaxy.model import ( User, UserCredentials, ) -from galaxy.model.orm.now import now +from galaxy.util import now from galaxy.model.scoped_session import galaxy_scoped_session from galaxy.schema.credentials import ( CredentialsContextResponse, diff --git a/lib/galaxy/managers/markdown_util.py b/lib/galaxy/managers/markdown_util.py index 323a2e98fd6..c2bfab154be 100644 --- a/lib/galaxy/managers/markdown_util.py +++ b/lib/galaxy/managers/markdown_util.py @@ -47,7 +47,7 @@ from galaxy.managers.jobs import ( from galaxy.managers.licenses import LicensesManager from galaxy.model import Job from galaxy.model.item_attrs import get_item_annotation_str -from galaxy.model.orm.now import now +from galaxy.util import now from galaxy.schema import PdfDocumentType from galaxy.schema.tasks import GeneratePdfDownload from galaxy.short_term_storage import ( diff --git a/lib/galaxy/managers/queue_metrics.py b/lib/galaxy/managers/queue_metrics.py index 4bd15878bf8..221d1c5a08b 100644 --- a/lib/galaxy/managers/queue_metrics.py +++ b/lib/galaxy/managers/queue_metrics.py @@ -34,7 +34,7 @@ from sqlalchemy import ( from galaxy.managers.sse import SSEConnectionManager from galaxy.model import WorkerProcess from galaxy.model.mapping import GalaxyModelMapping -from galaxy.model.orm.now import now +from galaxy.util import now from galaxy.queues import ( all_control_queues_for_declare, DEFAULT_ACTIVE_PROCESS_WINDOW_SECONDS, diff --git a/lib/galaxy/managers/sse.py b/lib/galaxy/managers/sse.py index 70d83cbf653..747e0cbefb3 100644 --- a/lib/galaxy/managers/sse.py +++ b/lib/galaxy/managers/sse.py @@ -19,7 +19,7 @@ from typing import ( Optional, ) -from galaxy.model.orm.now import now +from galaxy.util import now from galaxy.web.statsd_client import VanillaGalaxyStatsdClient log = logging.getLogger(__name__) @@ -28,7 +28,7 @@ log = logging.getLogger(__name__) def make_event_id() -> str: """Return an SSE ``id`` string for Last-Event-ID replay. - Uses ``galaxy.model.orm.now`` so the timestamp format matches the rest of + Uses ``galaxy.util.now`` so the timestamp format matches the rest of Galaxy's database-backed timestamps (timezone-naive UTC). Kept in one place so producers and the parse path cannot drift. """ diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py index 249b9a5aadc..ca5ed9495d5 100644 --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -165,7 +165,7 @@ from galaxy.model.item_attrs import ( get_item_annotation_str, UsesAnnotations, ) -from galaxy.model.orm.now import now +from galaxy.util import now from galaxy.model.orm.util import add_object_to_object_session from galaxy.objectstore import USER_OBJECTS_SCHEME from galaxy.objectstore.templates import ( diff --git a/lib/galaxy/model/database_heartbeat.py b/lib/galaxy/model/database_heartbeat.py index 143a94f1f11..926aaac3b89 100644 --- a/lib/galaxy/model/database_heartbeat.py +++ b/lib/galaxy/model/database_heartbeat.py @@ -12,7 +12,7 @@ from sqlalchemy import ( from galaxy.model import WorkerProcess from galaxy.model.base import check_database_connection -from galaxy.model.orm.now import now +from galaxy.util import now log = logging.getLogger(__name__) diff --git a/lib/galaxy/model/migrations/alembic/versions_gxy/186d4835587b_drop_job_state_history_update_time_.py b/lib/galaxy/model/migrations/alembic/versions_gxy/186d4835587b_drop_job_state_history_update_time_.py index 79250a75c71..0b57a69f65c 100644 --- a/lib/galaxy/model/migrations/alembic/versions_gxy/186d4835587b_drop_job_state_history_update_time_.py +++ b/lib/galaxy/model/migrations/alembic/versions_gxy/186d4835587b_drop_job_state_history_update_time_.py @@ -15,7 +15,7 @@ from galaxy.model.migrations.util import ( add_column, drop_column, ) -from galaxy.model.orm.now import now +from galaxy.util import now # revision identifiers, used by Alembic. revision = "186d4835587b" diff --git a/lib/galaxy/model/migrations/alembic/versions_gxy/570bce1e82f9_drop_cloudauthz_table.py b/lib/galaxy/model/migrations/alembic/versions_gxy/570bce1e82f9_drop_cloudauthz_table.py index 1afe2dbe505..9a680caa19d 100644 --- a/lib/galaxy/model/migrations/alembic/versions_gxy/570bce1e82f9_drop_cloudauthz_table.py +++ b/lib/galaxy/model/migrations/alembic/versions_gxy/570bce1e82f9_drop_cloudauthz_table.py @@ -14,7 +14,7 @@ from galaxy.model.migrations.util import ( drop_table, transaction, ) -from galaxy.model.orm.now import now +from galaxy.util import now # revision identifiers, used by Alembic. revision = "570bce1e82f9" diff --git a/lib/galaxy/model/tool_shed_install/__init__.py b/lib/galaxy/model/tool_shed_install/__init__.py index 4fa03b74647..1860cf5884f 100644 --- a/lib/galaxy/model/tool_shed_install/__init__.py +++ b/lib/galaxy/model/tool_shed_install/__init__.py @@ -30,7 +30,7 @@ from galaxy.model.custom_types import ( MutableJSONType, TrimmedString, ) -from galaxy.model.orm.now import now +from galaxy.util import now from galaxy.tool_util.toolbox.base import ( AbstractToolBox, DynamicToolConfDict, diff --git a/lib/galaxy/model/unittest_utils/store_fixtures.py b/lib/galaxy/model/unittest_utils/store_fixtures.py index c49890dd2d8..946518c2e53 100644 --- a/lib/galaxy/model/unittest_utils/store_fixtures.py +++ b/lib/galaxy/model/unittest_utils/store_fixtures.py @@ -6,7 +6,7 @@ from typing import ( ) from uuid import uuid4 -from galaxy.model.orm.now import now +from galaxy.util import now TEST_SOURCE_URI = "https://raw.githubusercontent.com/galaxyproject/galaxy/dev/test-data/2.bed" TEST_SOURCE_URI_SIMPLE_LINE = "https://raw.githubusercontent.com/galaxyproject/galaxy/dev/test-data/simple_line.txt" diff --git a/lib/galaxy/queues/__init__.py b/lib/galaxy/queues/__init__.py index a5fab0efc5f..21bb1df6d01 100644 --- a/lib/galaxy/queues/__init__.py +++ b/lib/galaxy/queues/__init__.py @@ -20,7 +20,7 @@ from kombu import ( from sqlalchemy import select from galaxy.model import WorkerProcess -from galaxy.model.orm.now import now +from galaxy.util import now if TYPE_CHECKING: from galaxy.web_stack import ApplicationStack diff --git a/lib/galaxy/workflow/scheduling_manager.py b/lib/galaxy/workflow/scheduling_manager.py index f26aefcc96c..9f278a62b1f 100644 --- a/lib/galaxy/workflow/scheduling_manager.py +++ b/lib/galaxy/workflow/scheduling_manager.py @@ -17,7 +17,7 @@ from galaxy import model from galaxy.exceptions import HandlerAssignmentError from galaxy.jobs.handler import InvocationGrabber from galaxy.model.base import check_database_connection -from galaxy.model.orm.now import now +from galaxy.util import now from galaxy.schema.invocation import ( FailureReason, InvocationFailureDatasetFailed, diff --git a/lib/tool_shed/webapp/model/__init__.py b/lib/tool_shed/webapp/model/__init__.py index 17aa85bd1f1..bdd916d1a8a 100644 --- a/lib/tool_shed/webapp/model/__init__.py +++ b/lib/tool_shed/webapp/model/__init__.py @@ -47,7 +47,7 @@ from galaxy.model.custom_types import ( MutableJSONType, TrimmedString, ) -from galaxy.model.orm.now import now +from galaxy.util import now from galaxy.model.orm.util import add_object_to_object_session from galaxy.security.validate_user_input import validate_password_str from galaxy.util import unique_id diff --git a/test/integration/resubmission_runners.py b/test/integration/resubmission_runners.py index 0a9d4273942..d176b665d74 100644 --- a/test/integration/resubmission_runners.py +++ b/test/integration/resubmission_runners.py @@ -4,7 +4,7 @@ import time from galaxy import model from galaxy.jobs.runners import JobState from galaxy.jobs.runners.local import LocalJobRunner -from galaxy.model.orm.now import now +from galaxy.util import now class FailsJobRunner(LocalJobRunner): diff --git a/test/unit/app/managers/test_markdown_export.py b/test/unit/app/managers/test_markdown_export.py index d9513f5182a..e0ebca98d34 100644 --- a/test/unit/app/managers/test_markdown_export.py +++ b/test/unit/app/managers/test_markdown_export.py @@ -9,7 +9,7 @@ from galaxy.managers.markdown_util import ( ready_galaxy_markdown_for_export, to_basic_markdown, ) -from galaxy.model.orm.now import now +from galaxy.util import now from .base import BaseTestCase diff --git a/test/unit/data/test_bco_utils.py b/test/unit/data/test_bco_utils.py index bd2a44c24be..0fa9bd6394f 100644 --- a/test/unit/data/test_bco_utils.py +++ b/test/unit/data/test_bco_utils.py @@ -1,7 +1,7 @@ import json from galaxy.model import WorkflowStep -from galaxy.model.orm.now import now +from galaxy.util import now from galaxy.model.store._bco_convert_utils import SoftwarePrerequisiteTracker from galaxy.schema.bco import ( BioComputeObjectCore,