Merge "Deprecate mox in favor of mox3"

This commit is contained in:
Jenkins
2013-12-16 02:06:36 +00:00
committed by Gerrit Code Review
3 changed files with 2 additions and 3 deletions

View File

@@ -18,7 +18,7 @@ from heatclient.v1.events import EventManager
from mock import MagicMock
from mock import patch
import mox
from mox3 import mox
import testtools

View File

@@ -18,7 +18,7 @@ from heatclient.v1.resources import Resource
from heatclient.v1.resources import ResourceManager
from mock import MagicMock
import mox
from mox3 import mox
import testtools

View File

@@ -7,7 +7,6 @@ coverage>=3.6
discover
fixtures>=0.3.14
mock>=1.0
mox>=0.5.3
mox3>=0.7.0
sphinx>=1.1.2,<1.2
testscenarios>=0.4