From 811ea7880e4c0c74f4a7f76158c19bab6365ca53 Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Sun, 20 Sep 2015 06:52:55 +0300 Subject: [PATCH] Unpin mock 1.0.1 since it has support for Python 2.6. --- setup.py | 6 +----- tox.ini | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index bd018e1f..3ca0daeb 100644 --- a/setup.py +++ b/setup.py @@ -45,11 +45,7 @@ with open(fname) as f: 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') diff --git a/tox.ini b/tox.ini index 252dc79e..380d8ac1 100644 --- a/tox.ini +++ b/tox.ini @@ -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