Skip to content

Commit

Permalink
seems sane to not support py26 anymore (#515)
Browse files Browse the repository at this point in the history
  • Loading branch information
ticosax authored and cgoldberg committed Jan 25, 2017
1 parent 3cddb18 commit 33a9a1a
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 7 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ python:
# Workaround for https://github.com/travis-ci/travis-ci/issues/4794
- 3.5
env:
- TOXENV=py26
- TOXENV=py27
- TOXENV=py33
- TOXENV=py34
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,4 @@ Open source licensed under the MIT license (see _LICENSE_ file for details).

## Supported Python Versions

Locust supports Python 2.6, 2.7 and 3.4.

Locust supports Python 2.7, 3.3, 3.4 and 3.5.
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ To see available options, run::
Supported Python Versions
-------------------------

Locust requires **Python 2.6+**. It is not currently compatible with Python 3.x.
Locust requires **Python 2.7+**. It is not currently compatible with Python 3.x.


Installing ZeroMQ
Expand Down
4 changes: 3 additions & 1 deletion locust/test/testcases.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@ def basic_auth():

@app.route("/no_content_length")
def no_content_length():
r = send_file(BytesIO("This response does not have content-length in the header".encode('utf-8')), add_etags=False)
r = send_file(BytesIO("This response does not have content-length in the header".encode('utf-8')),
add_etags=False,
mimetype='text/plain')
return r

@app.errorhandler(404)
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.3",
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py26, py27, py33, py34, py35
envlist = py27, py33, py34, py35

[testenv]
deps =
Expand Down

0 comments on commit 33a9a1a

Please sign in to comment.