From 88ed537a9e1d85bb8f86d9a4d1289fb8d50bb073 Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Mon, 28 Jul 2014 13:22:42 +0300 Subject: [PATCH] Skip test_sql_migrations on Python 3 for now. --- mediagoblin/tests/test_sql_migrations.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mediagoblin/tests/test_sql_migrations.py b/mediagoblin/tests/test_sql_migrations.py index e86dcd80..7e0569ad 100644 --- a/mediagoblin/tests/test_sql_migrations.py +++ b/mediagoblin/tests/test_sql_migrations.py @@ -14,9 +14,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -import copy - import six +import pytest + +pytestmark = pytest.mark.skipif(six.PY3, reason='needs sqlalchemy.migrate') + +import copy from sqlalchemy import ( Table, Column, MetaData, Index, @@ -25,7 +28,8 @@ from sqlalchemy import ( from sqlalchemy.orm import sessionmaker, relationship from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.sql import select, insert -from migrate import changeset +if six.PY2: + from migrate import changeset from mediagoblin.db.base import GMGTableBase from mediagoblin.db.migration_tools import MigrationManager, RegisterMigration -- 2.25.1