From 5c0b5b239cbb393af4a9fb06516c914330b2c8b9 Mon Sep 17 00:00:00 2001 From: Dave Shawley Date: Mon, 14 Sep 2015 07:37:17 -0400 Subject: [PATCH] Remove mock from requirements set. --- .travis.yml | 2 +- setup.py | 3 --- tox.ini | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index c434ea3..025e9ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ python: - pypy - 3.4 before_install: -- pip install nose coverage codecov mock tornado +- pip install nose coverage codecov tornado install: - pip install -e . script: nosetests diff --git a/setup.py b/setup.py index 0b1c765..e6dbfcd 100755 --- a/setup.py +++ b/setup.py @@ -11,9 +11,6 @@ install_requires = [] setup_requires = [] tests_require = ['nose>=1.3,<2', 'tornado>3,<5'] -if sys.version_info < (3, 0): - tests_require.append('mock') - setuptools.setup( name='sprockets.logging', version=sprockets.logging.__version__, diff --git a/tox.ini b/tox.ini index 4d2e5ad..3ca1f94 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py34,tornado3 +envlist = py27,py34,pypy,pypy3,tornado3 indexserver = default = https://pypi.python.org/simple toxworkdir = build/tox @@ -9,11 +9,9 @@ skip_missing_interpreters = true commands = nosetests [] deps = nose - mock tornado [testenv:tornado3] deps = nose - mock tornado>=3,<4