From 9c20efa78ec4c5f51150d3e135488f97dc8e7bfe Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Fri, 23 Mar 2018 09:00:59 -0700 Subject: [PATCH] Remove test dependency unittest2 As locust no longer support Python 2.6, there is no need to install unittest2. The unittest shipped with the Python 2.7+ stdlib is the same as unittest2. Results in fewer dependencies and slightly faster installation during testing. Python support was removed in version 0.8. --- .gitignore | 1 - Makefile | 2 +- setup.py | 2 +- tox.ini | 3 +-- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index faea13ed42..ca0f757d6e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ locust.egg-info/** locustio.egg-info/** docs/_build/** mock.*.egg -unittest2-*.egg/ dist/** .idea/** *.iml diff --git a/Makefile b/Makefile index 763f7f800a..80baf12a6f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ coverage: - coverage run -m unittest2 discover + coverage run -m unittest discover test: unit2 discover diff --git a/setup.py b/setup.py index d59fa4b87d..cc8b6d3e26 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ zip_safe=False, install_requires=["gevent>=1.2.2", "flask>=0.10.1", "requests>=2.9.1", "msgpack-python>=0.4.2", "six>=1.10.0", "pyzmq>=16.0.2"], test_suite="locust.test", - tests_require=['unittest2', 'mock'], + tests_require=['mock'], entry_points={ 'console_scripts': [ 'locust = locust.main:main', diff --git a/tox.ini b/tox.ini index 3b2519e3ec..599cff70c4 100644 --- a/tox.ini +++ b/tox.ini @@ -7,6 +7,5 @@ deps = codecov mock pyzmq - unittest2 commands = - coverage run -m unittest2 discover [] + coverage run -m unittest discover []