From b972f23ba6d3f60d647930f7b3a569d66d7c91c1 Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem.os@gmail.com>
Date: Wed, 23 Oct 2019 14:09:20 -0400
Subject: [PATCH] Remove fixed sqlalchemy-migrate deprecation warning filters

Both [1] and [2] are fixed in sqlalchemy-migrate 0.13.0 so
we can bump requirements and drop the warnings filters.

Depends-On: https://review.opendev.org/690419/

[1] https://review.opendev.org/682518/
[2] https://review.opendev.org/671040/

Change-Id: Idf2cf26d64e0a535291f710d1b510f4780e40587
---
 lower-constraints.txt  |  2 +-
 nova/tests/fixtures.py | 15 ---------------
 requirements.txt       |  2 +-
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index ae2a119bdfa2..25b258cb43ac 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -146,7 +146,7 @@ six==1.10.0
 smmap2==2.0.3
 sortedcontainers==2.1.0
 SQLAlchemy==1.2.19
-sqlalchemy-migrate==0.11.0
+sqlalchemy-migrate==0.13.0
 sqlparse==0.2.4
 statsd==3.2.2
 stestr==1.0.0
diff --git a/nova/tests/fixtures.py b/nova/tests/fixtures.py
index 93b88b3907c6..8b4566a52299 100644
--- a/nova/tests/fixtures.py
+++ b/nova/tests/fixtures.py
@@ -882,21 +882,6 @@ class WarningsFixture(fixtures.Fixture):
             'ignore', message=".* 'VIFPortProfileOVSRepresentor' .* "
             "is deprecated", category=PendingDeprecationWarning)
 
-        # TODO(mriedem): Change (or remove) this DeprecationWarning once
-        # https://bugs.launchpad.net/sqlalchemy-migrate/+bug/1814288 is fixed.
-        warnings.filterwarnings(
-            'ignore', message=r'inspect.getargspec\(\) is deprecated',
-            category=DeprecationWarning,
-            module='migrate.versioning.script.py')
-
-        # TODO(stephenfin): Remove once we bump our sqlalchemy-migrate version
-        # to whatever is released early in Ussuri and includes change
-        # I319785d7dd83ffe2c6e651a2494b073becc84684
-        warnings.filterwarnings(
-            'ignore', message='The Engine.contextual_connect.*',
-            category=sqla_exc.SADeprecationWarning,
-            module='migrate.changeset.databases.visitor')
-
         self.addCleanup(warnings.resetwarnings)
 
 
diff --git a/requirements.txt b/requirements.txt
index 57e45ceba487..d675d3e11132 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ greenlet>=0.4.10,!=0.4.14 # MIT
 PasteDeploy>=1.5.0 # MIT
 Paste>=2.0.2 # MIT
 PrettyTable<0.8,>=0.7.1 # BSD
-sqlalchemy-migrate>=0.11.0 # Apache-2.0
+sqlalchemy-migrate>=0.13.0 # Apache-2.0
 netaddr>=0.7.18 # BSD
 netifaces>=0.10.4 # MIT
 paramiko>=2.0.0 # LGPLv2.1+