Merge "Avoid imposing alembic 6.0 requirement on all distros"

ceilometer/storage/sqlalchemy/alembic/versions/2c3ccda5a3ad_fix_uniq_name.py

@@ -46,12 +46,12 @@ def change_uniq(table_name, uniq_name, columns, downgrade=False):
         #  before renaming of constraint.
         op.drop_constraint('fk_sourceassoc_meter_id',
                            table_name,
-                           type_='foreignkey')
+                           type='foreignkey')
         op.drop_constraint('fk_sourceassoc_user_id',
                            table_name,
-                           type_='foreignkey')
+                           type='foreignkey')
     if downgrade:
-        op.drop_constraint(uniq_name, table_name=table_name, type_='unique')
+        op.drop_constraint(uniq_name, table_name=table_name, type='unique')
     else:
         op.create_unique_constraint(uniq_name, table_name, columns)
     if engine.name == 'mysql':

ceilometer/storage/sqlalchemy/alembic/versions/b6ae66d05e3_remove_extra_indexes.py

@@ -65,7 +65,7 @@ def index_cleanup(engine_names, table_name, uniq_name, columns, create,
             op.create_index(uniq_name, table_name, columns, unique=unique)
     else:
         if unique:
-            op.drop_constraint(uniq_name, table_name, type_='unique')
+            op.drop_constraint(uniq_name, table_name, type='unique')
         else:
             op.drop_index(uniq_name, table_name=table_name)
 

requirements.txt

@@ -5,7 +5,7 @@ iso8601>=0.1.4
 argparse
 SQLAlchemy>=0.7.8,<0.8
 sqlalchemy-migrate>=0.7.2
-alembic>=0.6.0
+alembic>=0.4.1
 netaddr
 pymongo>=2.4
 eventlet>=0.13.0