From d68af3c552a0107ff7b42c562629fc2ec1a45880 Mon Sep 17 00:00:00 2001 From: Mark Beacom Date: Fri, 8 Sep 2017 03:22:18 -0400 Subject: [PATCH] Modify gevent wsgi and libev dependencies --- .travis.yml | 2 +- docs/installation.rst | 4 ++-- examples/vagrant/vagrant.sh | 2 +- locust/web.py | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79606a97f7..a0cb20f3d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: addons: apt: packages: - - libevent-dev + - libev-dev install: - pip install tox script: diff --git a/docs/installation.rst b/docs/installation.rst index 52d286cbf3..178f73e2be 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -59,9 +59,9 @@ Installing Locust on OS X The following is currently the shortest path to installing gevent on OS X using Homebrew. #. Install `Homebrew `_. -#. Install libevent (dependency for gevent):: +#. Install libev (dependency for gevent):: - brew install libevent + brew install libev #. Then follow the above instructions. diff --git a/examples/vagrant/vagrant.sh b/examples/vagrant/vagrant.sh index 224f4d5230..62c6e2a912 100644 --- a/examples/vagrant/vagrant.sh +++ b/examples/vagrant/vagrant.sh @@ -6,7 +6,7 @@ # Update and install some dependencies apt-get -y update -apt-get -y install build-essential python-pip python-dev libevent-dev libev-dev libzmq-dev +apt-get -y install build-essential python-pip python-dev libev-dev libzmq-dev cd /vagrant pip install --use-mirrors pyzmq supervisor diff --git a/locust/web.py b/locust/web.py index 124e1775f2..e7cac5d015 100644 --- a/locust/web.py +++ b/locust/web.py @@ -9,7 +9,7 @@ from six.moves import StringIO, xrange import six -from gevent import wsgi +from gevent import pywsgi from flask import Flask, make_response, request, render_template from . import runners @@ -175,5 +175,6 @@ def exceptions_csv(): return response def start(locust, options): - wsgi.WSGIServer((options.web_host, options.port), app, log=None).serve_forever() + pywsgi.WSGIServer((options.web_host, options.port), + app, log=None).serve_forever()