Skip to content

Commit

Permalink
Unpin mock 1.0.1 since it has support for Python 2.6.
Browse files Browse the repository at this point in the history
  • Loading branch information
berkerpeksag committed Sep 20, 2015
1 parent 5b823e2 commit 811ea78
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
6 changes: 1 addition & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,7 @@
tests_require = [l.strip() for l in f.readlines()]

if sys.version_info[:2] < (3, 3):
# recent versions of mock doesn't support Python 2.6
if sys.version_info[:2] == (2, 6):
tests_require.append('mock==1.0.1')
else:
tests_require.append('mock')
tests_require.append('mock')
if sys.version_info[:2] < (2, 7):
tests_require.append('unittest2')

Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ commands = py.test {posargs:tests/}
deps =
-rrequirements_test.txt
py26: unittest2
py26: mock==1.0.1
py27,pypy,py32,pypy3: mock
py2{6,7},pypy,py32,pypy3: mock
py3{3,4}: aiohttp

0 comments on commit 811ea78

Please sign in to comment.