repair py3k merge

in 79f84f71e1045aafed389e7b221 I merged without rebasing
so we missed updating the recent version_locations patch,
fix that.

also we don't need mock as a test dependency.

Change-Id: Ic2fe1db8b105c60ec51eefec7a4dc8d8c495b119

diff --git a/alembic/script/base.py b/alembic/script/base.py
index a96f264b45ef6e9e7f8a0918efe4b090c8727aad..d0500c4e5e8676ce0a6b251d3aaf8747d3c506ee 100644 (file)
--- a/alembic/script/base.py
+++ b/alembic/script/base.py
@@ -154,15 +154,11 @@ class ScriptDirectory:
             try:
                 split_char = split_on_path[version_path_separator]
             except KeyError as ke:
-                util.raise_(
-                    ValueError(
-                        "'%s' is not a valid value for "
-                        "version_path_separator; "
-                        "expected 'space', 'os', ':', ';'"
-                        % version_path_separator
-                    ),
-                    from_=ke,
-                )
+                raise ValueError(
+                    "'%s' is not a valid value for "
+                    "version_path_separator; "
+                    "expected 'space', 'os', ':', ';'" % version_path_separator
+                ) from ke
             else:
                 if split_char is None:
                     # legacy behaviour for backwards compatibility

diff --git a/tox.ini b/tox.ini
index e52e1a426286e90d04f8641105ae950636374d88..f5456d8ea1660710f052ca74fb335a6d9838a43a 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,6 @@ cov_args=--cov=alembic --cov-report term --cov-report xml
 
 deps=pytest>4.6
      pytest-xdist
-     mock
      sqla13: {[tox]SQLA_REPO}@rel_1_3#egg=sqlalchemy
      sqlamaster: {[tox]SQLA_REPO}@master#egg=sqlalchemy
      postgresql: psycopg2>=2.7