Skip to content

Commit

Permalink
Remove test dependency unittest2 (#755)
Browse files Browse the repository at this point in the history
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 2.6 support was removed in version 0.8.
  • Loading branch information
jdufresne authored and cgoldberg committed Mar 23, 2018
1 parent 524ab52 commit aa741c9
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ locust.egg-info/**
locustio.egg-info/**
docs/_build/**
mock.*.egg
unittest2-*.egg/
dist/**
.idea/**
*.iml
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
coverage:
coverage run -m unittest2 discover
coverage run -m unittest discover

test:
unit2 discover
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ deps =
codecov
mock
pyzmq
unittest2
commands =
coverage run -m unittest2 discover []
coverage run -m unittest discover []

0 comments on commit aa741c9

Please sign in to comment.