Merge "Do not require external mock on Python 3"
This commit is contained in:
commit
4ffa21de8d
|
@ -17,8 +17,11 @@ import errno
|
|||
import functools
|
||||
import json
|
||||
import os
|
||||
try:
|
||||
from unittest import mock
|
||||
except ImportError:
|
||||
import mock
|
||||
|
||||
import mock
|
||||
from oslotest import base
|
||||
from testscenarios import load_tests_apply_scenarios as load_tests # noqa
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
hacking>=0.9.2,<0.10
|
||||
|
||||
coverage>=3.6
|
||||
mock>=1.0
|
||||
mock>=1.0;python_version=='2.7'
|
||||
python-subunit
|
||||
sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7'
|
||||
sphinx!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4'
|
||||
|
|
Loading…
Reference in New Issue