Move triggers out of migrate directory

galaxyproject · Dec 7, 2021 · c181ef1 · c181ef1
1 parent d63d3b5
commit c181ef1
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/lib/galaxy/model/mapping.py b/lib/galaxy/model/mapping.py
@@ -11,9 +11,9 @@
 from galaxy import model
 from galaxy.model import mapper_registry
 from galaxy.model.base import SharedModelMapping
-from galaxy.model.migrate.triggers.update_audit_table import install as install_timestamp_triggers
 from galaxy.model.orm.engine_factory import build_engine
 from galaxy.model.security import GalaxyRBACAgent
+from galaxy.model.triggers.update_audit_table import install as install_timestamp_triggers
 from galaxy.model.view.utils import install_views
 
 log = logging.getLogger(__name__)

diff --git a/lib/galaxy/model/migrate/versions/0165_add_content_update_time.py b/lib/galaxy/model/migrate/versions/0165_add_content_update_time.py
@@ -7,9 +7,9 @@
 
 from sqlalchemy import Column, DateTime, MetaData, Table
 
-from galaxy.model.migrate.triggers.history_update_time_field import drop_timestamp_triggers, install_timestamp_triggers
 from galaxy.model.migrate.versions.util import add_column, drop_column
 from galaxy.model.orm.now import now
+from galaxy.model.triggers.history_update_time_field import drop_timestamp_triggers, install_timestamp_triggers
 
 log = logging.getLogger(__name__)
 metadata = MetaData()

diff --git a/lib/galaxy/model/migrate/versions/0174_readd_update_time_triggers.py b/lib/galaxy/model/migrate/versions/0174_readd_update_time_triggers.py
@@ -6,7 +6,7 @@
 
 from sqlalchemy import MetaData
 
-from galaxy.model.migrate.triggers.history_update_time_field import (
+from galaxy.model.triggers.history_update_time_field import (
     drop_timestamp_triggers,
     install_timestamp_triggers,
 )

diff --git a/lib/galaxy/model/migrate/versions/0175_history_audit.py b/lib/galaxy/model/migrate/versions/0175_history_audit.py
@@ -7,14 +7,14 @@
 
 from sqlalchemy import Column, DateTime, ForeignKey, Integer, MetaData, PrimaryKeyConstraint, Table
 
-from galaxy.model.migrate.triggers import (
-    history_update_time_field as old_triggers,  # rollback to old ones
-    update_audit_table as new_triggers,  # install me
-)
 from galaxy.model.migrate.versions.util import (
     create_table,
     drop_table
 )
+from galaxy.model.triggers import (
+    history_update_time_field as old_triggers,  # rollback to old ones
+    update_audit_table as new_triggers,  # install me
+)
 
 log = logging.getLogger(__name__)
 now = datetime.datetime.utcnow

diff --git a/...galaxy/model/migrate/triggers/__init__.py → lib/galaxy/model/triggers/__init__.py b/...galaxy/model/migrate/triggers/__init__.py → lib/galaxy/model/triggers/__init__.py
diff --git a/...ate/triggers/history_update_time_field.py → ...del/triggers/history_update_time_field.py b/...ate/triggers/history_update_time_field.py → ...del/triggers/history_update_time_field.py
diff --git a/...el/migrate/triggers/update_audit_table.py → ...laxy/model/triggers/update_audit_table.py b/...el/migrate/triggers/update_audit_table.py → ...laxy/model/triggers/update_audit_table.py
diff --git a/packages/data/setup.py b/packages/data/setup.py
@@ -40,13 +40,13 @@ def get_var(var_name):
     'galaxy.model.dataset_collections',
     'galaxy.model.dataset_collections.types',
     'galaxy.model.migrate',
-    'galaxy.model.migrate.triggers',
     'galaxy.model.migrate.versions',
     'galaxy.model.orm',
     'galaxy.model.store',
     'galaxy.model.tool_shed_install',
     'galaxy.model.tool_shed_install.migrate',
     'galaxy.model.tool_shed_install.migrate.versions',
+    'galaxy.model.triggers',
     'galaxy.model.unittest_utils',
     'galaxy.model.view',
     'galaxy.quota',