From 48f49b303e4d8eaa162ab2d66bf29b23a49c1d8a Mon Sep 17 00:00:00 2001 From: Nicolas Delaby Date: Thu, 12 Jan 2017 12:53:23 +0100 Subject: [PATCH 1/2] seems sane to not support py26 anymore --- .travis.yml | 1 - README.md | 3 +-- docs/installation.rst | 2 +- setup.py | 1 - tox.ini | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e9fedd396..5cbf7a5241 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/README.md b/README.md index 4b637966a0..9f189772e3 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/docs/installation.rst b/docs/installation.rst index 1daebc6f86..0f965cf73c 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -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 diff --git a/setup.py b/setup.py index 38a2418dbd..b62484fb6e 100644 --- a/setup.py +++ b/setup.py @@ -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", diff --git a/tox.ini b/tox.ini index ad926ac58e..2b80387979 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py26, py27, py33, py34, py35 +envlist = py27, py33, py34, py35 [testenv] deps = From 577b64dd180ed6738496f9c97e174f9cf1966ec6 Mon Sep 17 00:00:00 2001 From: Nicolas Delaby Date: Thu, 12 Jan 2017 12:55:17 +0100 Subject: [PATCH 2/2] Fix failing test --- locust/test/testcases.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/locust/test/testcases.py b/locust/test/testcases.py index adfbffcdc6..0b9b261123 100644 --- a/locust/test/testcases.py +++ b/locust/test/testcases.py @@ -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)