From 5cb97f3a40c90624eafd12b11802b6a6af04c7e9 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 29 Oct 2020 16:25:00 +0000 Subject: [PATCH] trivial: Remove references to sqlalchemy-migrate Change-Id: I9eda5e5ac697c110e6047c6086855e04cbfe6b87 Implements: blueprint remove-sqlalchemy-migrate Signed-off-by: Stephen Finucane --- glance/cmd/manage.py | 6 +++--- requirements.txt | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/glance/cmd/manage.py b/glance/cmd/manage.py index 7139514f56..8e5169d5a2 100644 --- a/glance/cmd/manage.py +++ b/glance/cmd/manage.py @@ -145,15 +145,15 @@ class DbCommands(object): # This flags let's us bypass trigger setup & teardown for non-rolling # upgrades. We set this as a global variable immediately before handing - # off to sqlalchemy-migrate, because we can't pass arguments directly - # to migrations that depend on it. + # off to alembic, because we can't pass arguments directly to + # migrations that depend on it. USE_TRIGGERS = False curr_heads = alembic_migrations.get_current_alembic_heads() contract = alembic_migrations.get_alembic_branch_head( db_migration.CONTRACT_BRANCH) - if (contract in curr_heads): + if contract in curr_heads: print(_('Database is up to date. No migrations needed.')) sys.exit() diff --git a/requirements.txt b/requirements.txt index 853c0000ff..bcdaa8c572 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,6 @@ eventlet>=0.25.1 # MIT PasteDeploy>=1.5.0 # MIT Routes>=2.3.1 # MIT WebOb>=1.8.1 # MIT -sqlalchemy-migrate>=0.11.0 # Apache-2.0 sqlparse>=0.2.2 # BSD alembic>=0.9.6 # MIT httplib2>=0.9.1 # MIT