From e892deae361935234360b68be062ef6bdd7c93e8 Mon Sep 17 00:00:00 2001 From: Jonatan Heyman Date: Tue, 19 Sep 2017 19:08:00 +0200 Subject: [PATCH 1/4] Upgrade pyzmq to latest stable version, and changed so that we do not pin the version (will make it easier to install Locust on Windows) --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b66f8cbc79..d59fa4b87d 100644 --- a/setup.py +++ b/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={ From 39550c71efd900f9711b098b11fd909a803c782a Mon Sep 17 00:00:00 2001 From: Jonatan Heyman Date: Tue, 19 Sep 2017 19:21:08 +0200 Subject: [PATCH 2/4] Better installation instructions for Windows --- docs/installation.rst | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 178f73e2be..43a594c3f7 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -40,12 +40,19 @@ 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`` might fail depedning on if you have a build environment +set up correctly. In that case, the easiest way to get Locust running on windows is to first install +the pre built binary package for pyzmq (and possibly for gevent and greenlet as well). You can find an unofficial collection of pre built python packages for windows here: `http://www.lfd.uci.edu/~gohlke/pythonlibs/ `_ +When you've downloaded a pre-built ``.whl`` file, you can install it with:: + + pip install pyzmq‑16.0.2‑cp36‑cp36m‑win32.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 From 769551a03c6346a601c1b155a30901ec5e24f167 Mon Sep 17 00:00:00 2001 From: Jonatan Heyman Date: Tue, 19 Sep 2017 19:23:58 +0200 Subject: [PATCH 3/4] Bumped version to 0.8.1 --- docs/changelog.rst | 7 +++++++ locust/__init__.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 40fd014ccd..0a7fc5e713 100644 --- a/docs/changelog.rst +++ b/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 === diff --git a/locust/__init__.py b/locust/__init__.py index 402c692d31..7fd2112325 100644 --- a/locust/__init__.py +++ b/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" From 0c6da8575d39911f160bd8613f26b6fee09f5fac Mon Sep 17 00:00:00 2001 From: Jonatan Heyman Date: Tue, 19 Sep 2017 19:34:52 +0200 Subject: [PATCH 4/4] Better installation instructions for Windows --- docs/installation.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 43a594c3f7..225b28b2fa 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -40,16 +40,17 @@ or:: Installing Locust on Windows ---------------------------- -On Windows, running ``pip install locustio`` might fail depedning on if you have a build environment -set up correctly. In that case, the easiest way to get Locust running on windows is to first install -the pre built binary package for pyzmq (and possibly for gevent and greenlet as well). +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/ `_ When you've downloaded a pre-built ``.whl`` file, you can install it with:: - pip install pyzmq‑16.0.2‑cp36‑cp36m‑win32.whl + pip install name-of-file.whl Once you've done that you should be able to just ``pip install locustio``.