From ba6e0558652387bcc8b67425e5ef37c0f1ef8307 Mon Sep 17 00:00:00 2001 From: ps-george Date: Mon, 28 May 2018 15:18:40 +0100 Subject: [PATCH] Drop Python 3.3 support (#804) * Removing py33 from tox; no longer supported by TravisCI * Removing py33 from Travis conf; no longer supported * Change unsupported wsgi to pywsgi * Remove reference to Python 3.3, no longer supported. --- .travis.yml | 2 -- README.md | 2 +- docs/installation.rst | 2 +- locust/test/test_web.py | 4 ++-- setup.py | 1 - tox.ini | 2 +- 6 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index fddc66580d..7cd6ae159d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,6 @@ matrix: env: TOXENV=py35 - python: 3.4 env: TOXENV=py34 - - python: 3.3 - env: TOXENV=py33 - python: 2.7 env: TOXENV=py27 addons: diff --git a/README.md b/README.md index fe61fe5900..224df8d9c9 100644 --- a/README.md +++ b/README.md @@ -74,4 +74,4 @@ Open source licensed under the MIT license (see _LICENSE_ file for details). ## Supported Python Versions -Locust supports Python 2.7, 3.3, 3.4, 3.5, and 3.6. +Locust supports Python 2.7, 3.4, 3.5, and 3.6. diff --git a/docs/installation.rst b/docs/installation.rst index 6d7fa33b43..320adf4ee3 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -21,7 +21,7 @@ To see available options, run: Supported Python Versions ------------------------- -Locust supports Python 2.7, 3.3, 3.4, 3.5, and 3.6. +Locust supports Python 2.7, 3.4, 3.5, and 3.6. Installing Locust on Windows diff --git a/locust/test/test_web.py b/locust/test/test_web.py index dd018242be..ed3f07ebd0 100644 --- a/locust/test/test_web.py +++ b/locust/test/test_web.py @@ -6,7 +6,7 @@ import gevent import requests -from gevent import wsgi +from gevent import pywsgi from locust import events, runners, stats, web from locust.main import parse_options @@ -27,7 +27,7 @@ def setUp(self): web.request_stats.clear_cache() - self._web_ui_server = wsgi.WSGIServer(('127.0.0.1', 0), web.app, log=None) + self._web_ui_server = pywsgi.WSGIServer(('127.0.0.1', 0), web.app, log=None) gevent.spawn(lambda: self._web_ui_server.serve_forever()) gevent.sleep(0.01) self.web_port = self._web_ui_server.server_port diff --git a/setup.py b/setup.py index 64a5db2d7a..37a43b9672 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,6 @@ "Programming Language :: Python :: 2", "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", diff --git a/tox.ini b/tox.ini index 49276f64b6..dfa2693c85 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py33, py34, py35, py36 +envlist = py27, py34, py35, py36 [testenv] deps =