From 3b2e54bc7c7df3aee805ab1939c24a9f8898da2e Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 19 Nov 2015 16:00:54 +0000 Subject: [PATCH] Make elasticsearch-py a dev requirement The Elasticsearch tests now depend on an environment variable being set so we can safely install elasticsearch-py without Wagtail automatically assuming Elasticsearch is installed and running the tests. This makes developer setup slightly easier, but also opens up the possibility for running some of the ES tests that don't depend on a running ES instance. --- docs/contributing/developing.rst | 6 ++---- requirements-dev.txt | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/contributing/developing.rst b/docs/contributing/developing.rst index 01e5447961..818bb9e8d0 100644 --- a/docs/contributing/developing.rst +++ b/docs/contributing/developing.rst @@ -90,10 +90,8 @@ the tests against it. **Testing Elasticsearch** -To test Elasticsearch, you need to have the ``elasticsearch`` package installed. - -Once installed, you can test Wagtail with Elasticsearch by passing the -``--elasticsearch`` argument to ``runtests.py``:: +You can test Wagtail against Elasticsearch by passing the ``--elasticsearch`` +argument to ``runtests.py``:: python runtests.py --elasticsearch diff --git a/requirements-dev.txt b/requirements-dev.txt index 8b55456462..64468d0cea 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,6 +3,7 @@ mock>=1.0.0 python-dateutil>=2.2 pytz>=2014.7 Pillow>=2.7.0 +elasticsearch>=1.0.0 # For coverage and PEP8 linting coverage>=3.7.0