unblock pytest-xdist, add sqla master

Change-Id: I8e150e5e4de50c9819c97ab2b3960c1eb9c0ebd1

diff --git a/alembic/__init__.py b/alembic/__init__.py
index 1f655bb5a6dfb38f66ed04f4122d116ea1e4e3b2..f1df8de6684a98c6d78ecae35f52aac3315a552b 100644 (file)
--- a/alembic/__init__.py
+++ b/alembic/__init__.py
@@ -1,6 +1,6 @@
 from os import path
 
-__version__ = '0.9.5'
+__version__ = '0.9.6'
 
 package_dir = path.abspath(path.dirname(__file__))
 

diff --git a/alembic/testing/requirements.py b/alembic/testing/requirements.py
index 38527720fb19455f0014a330890635677a0d60b7..51d06fff4abbcda6eaa8b59472fc6c16a1640f5c 100644 (file)
--- a/alembic/testing/requirements.py
+++ b/alembic/testing/requirements.py
@@ -23,6 +23,11 @@ class SuiteRequirements(Requirements):
             if not util.sqla_084:
                 return True
             from sqlalchemy import inspect
+
+            # temporary
+            if config.db.name == "oracle":
+                return True
+
             insp = inspect(config.db)
             try:
                 insp.get_unique_constraints('x')

diff --git a/tests/requirements.py b/tests/requirements.py
index 522ac5bf8a0ed693fce95452ebd15ae9b76bf658..2129e4329ebee7b9107a8090e5b3d34d4b37cde7 100644 (file)
--- a/tests/requirements.py
+++ b/tests/requirements.py
@@ -89,7 +89,7 @@ class DefaultRequirements(SuiteRequirements):
 
     @property
     def reflects_unique_constraints_unambiguously(self):
-        return exclusions.fails_on("mysql")
+        return exclusions.fails_on("mysql", "oracle")
 
     @property
     def reflects_pk_names(self):

diff --git a/tests/test_config.py b/tests/test_config.py
index 7b39087197e68d7b46b2fd0d1fe5fcf0d33f76f5..d9f998cb65b5bf33fa36a1cd02821d405401debc 100644 (file)
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -16,6 +16,7 @@ from alembic.testing.env import _no_sql_testing_config, clear_staging_env,\
 
 
 class FileConfigTest(TestBase):
+
     def test_config_args(self):
         cfg = _write_config_file("""
 [alembic]

diff --git a/tox.ini b/tox.ini
index a97c6e115434af91fad9c06a5c4f489ba3f0b915..d93b9897d5ebbee3d749e02cbc353cc74cf4607a 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,22 +1,23 @@
 [tox]
 
-# current mysqlclient fails with <=SQLA 0.9 on py3k due to 
+# current mysqlclient fails with <=SQLA 0.9 on py3k due to
 # old unicode statements flag
-envlist = py{27,33,34,35,36}-sqla{10,11}, py{27}-sqla{079,084,09}
+envlist = py{27,33,34,35,36}-sqla{10,11,master}, py{27}-sqla{079,084,09}
 
 SQLA_REPO = {env:SQLA_REPO:git+http://git.sqlalchemy.org/sqlalchemy.git}
 
 [testenv]
 cov_args=--cov=alembic --cov-report term --cov-report xml
 
-deps=pytest<=3.0.7
-     pytest-xdist<=1.16.0
+deps=pytest
+     pytest-xdist
      mock
      sqla079: {[tox]SQLA_REPO}@rel_0_7_9
      sqla084: {[tox]SQLA_REPO}@rel_0_8_4
      sqla09: {[tox]SQLA_REPO}@rel_0_9
      sqla10: {[tox]SQLA_REPO}@rel_1_0
      sqla11: {[tox]SQLA_REPO}@rel_1_1
+     sqlamaster: {[tox]SQLA_REPO}@master
      postgresql: psycopg2
      mysql: mysqlclient
      oracle: cx_oracle