Remove mock dependency

Mock is not needed over python 3.3, we need this tox
requirement only for Python 2.7 right now.

Change-Id: I06ae31f9fe6eaece0ec508e9431e4f8166a59684
(cherry picked from commit 0396fb761ee3a5778d4a3414bc724f43d041ffe1)

diff --git a/lib/sqlalchemy/testing/suite/test_types.py b/lib/sqlalchemy/testing/suite/test_types.py
index 82a842102cdc79f6c50d61515dd8b66703af0e05..3cc0ec1f6ec4498aab1df0ea93441d6f41f748dd 100644 (file)
--- a/lib/sqlalchemy/testing/suite/test_types.py
+++ b/lib/sqlalchemy/testing/suite/test_types.py
@@ -4,11 +4,10 @@ import datetime
 import decimal
 import json
 
-import mock
-
 from .. import config
 from .. import engines
 from .. import fixtures
+from .. import mock
 from ..assertions import eq_
 from ..config import requirements
 from ..schema import Column

diff --git a/tox.ini b/tox.ini
index 0325d9e677adecf6a937cff11b9884a915bc186b..0b4b77e167293153103a202c49746568757fd56a 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ usedevelop=
 
 deps=pytest!=3.9.1,!=3.9.2
      pytest-xdist
-     mock
+     mock; python_version < '3.3'
      # needed only for correct profiling results
      # due to speed improvements in psycopg2 as of 2.7
      postgresql: psycopg2>=2.7