Merge 0.8 branch.

docs/changelog.rst

@@ -2,6 +2,13 @@
 Changelog
 ##########
 
+0.8.1
+=====
+
+* Updated pyzmq version, and changed so that we don't pin a specific version.
+  This makes it easier to install Locust on Windows.
+
+
 0.8
 ===
 

docs/installation.rst

@@ -40,12 +40,20 @@ or::
 Installing Locust on Windows
 ----------------------------
 
-The easiest way to get Locust running on Windows is to first install pre built binary packages for
-gevent and greenlet and then follow the above instructions. 
+On Windows, running ``pip install locustio`` *should* work. 
+
+However, if it doesn't, chances are that it can be fixed by first installing
+the pre built binary packages for pyzmq, gevent and greenlet. 
 
 You can find an unofficial collection of pre built python packages for windows here: 
 `http://www.lfd.uci.edu/~gohlke/pythonlibs/ <http://www.lfd.uci.edu/~gohlke/pythonlibs/>`_
 
+When you've downloaded a pre-built ``.whl`` file, you can install it with::
+
+    pip install name-of-file.whl
+
+Once you've done that you should be able to just ``pip install locustio``. 
+
 .. note::
 
     Running Locust on Windows should work fine for developing and testing your load testing 

locust/__init__.py

@@ -1,4 +1,4 @@
 from .core import HttpLocust, Locust, TaskSet, task
 from .exception import InterruptTaskSet, ResponseError, RescheduleTaskImmediately
 
-__version__ = "0.8"
+__version__ = "0.8.1"

setup.py

@@ -41,7 +41,7 @@
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
     include_package_data=True,
     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==15.2.0"],
+    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'],
     entry_points={