Skip to content

Commit

Permalink
Use mock from the standard library when available
Browse files Browse the repository at this point in the history
  • Loading branch information
carlwgeorge committed Oct 18, 2019
1 parent 9a0c10d commit fdf77e0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ flake8
nose
six>=1.4.0
PyYAML
mock
mock; python_version < '3.3'
5 changes: 4 additions & 1 deletion test/test_functional.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
import json

import six
import mock
try:
from unittest import mock
except ImportError:
import mock

from ddt import ddt, data, file_data
from nose.tools import (
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ deps =
flake8
six>=1.4.0
PyYAML
mock
commands =
nosetests -s --with-coverage --cover-package=ddt --cover-html
flake8 ddt.py test

[testenv:py27]
deps =
{[testenv]deps}
mock
Sphinx
sphinxcontrib-programoutput
commands =
Expand Down

0 comments on commit fdf77e0

Please sign in to comment.