From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 22 Aug 2019 18:11:18 +0000 (-0400)
Subject: Remove mock dependency
X-Git-Tag: rel_1_3_8~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f03f349bd4542928592595366bf034c0b93d806a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

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 82a842102c..3cc0ec1f6e 100644
--- 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 0325d9e677..0b4b77e167 100644
--- 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