Merge pull request #175 from safwanrahman/travis

Fixing CI and Documentations

Author: safwanrahman

.travis.yml

@@ -3,53 +3,49 @@
 language: python
 python: 3.7
 
-dist: trusty # default "precise" distro doesn't include Java 8 for Elasticsearch 5
+dist: xenial # default "precise" distro doesn't include Java 8 for Elasticsearch 5
 
 matrix:
   include:
-    - env: TOX_ENV=py36-django-110-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
+    - env: TOX_ENV=py36-django-110-es6
       python: 3.6
-    - env: TOX_ENV=py37-django-110-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
+    - env: TOX_ENV=py37-django-110-es6
       python: 3.7
-      sudo: true
-      dist: xenial
-    - env: TOX_ENV=py27-django-110-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
+    - env: TOX_ENV=py27-django-110-es6
       python: 2.7
-    - env: TOX_ENV=py36-django-111-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
+    - env: TOX_ENV=py36-django-111-es6
       python: 3.6
-    - env: TOX_ENV=py37-django-111-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
+    - env: TOX_ENV=py37-django-111-es6
       python: 3.7
-      sudo: true
-      dist: xenial
-    - env: TOX_ENV=py27-django-111-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
+    - env: TOX_ENV=py27-django-111-es6
       python: 2.7
-    - env: TOX_ENV=py36-django-2-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
+    - env: TOX_ENV=py36-django-2-es6
       python: 3.6
-    - env: TOX_ENV=py37-django-2-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
+    - env: TOX_ENV=py37-django-2-es6
       python: 3.7
-      sudo: true
-      dist: xenial
-    - env: TOX_ENV=py37-django-21-es6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
+    - env: TOX_ENV=py37-django-21-es6
       python: 3.7
-      dist: xenial
-      sudo: true
 
 cache: pip
+env:
+  global:
+    - ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
 
 before_install:
   # work around https://github.com/travis-ci/travis-ci/issues/8363
   - pip install codecov
   - wget -qO - https://packages.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add -
   - echo "deb $ES_APT_URL stable main" | sudo tee -a /etc/apt/sources.list.d/elk.list
+  - sudo apt-get remove --purge elasticsearch -y
   - sudo apt-get update && sudo apt-get install elasticsearch -y
-  - sudo service elasticsearch start
+  - sudo -i service elasticsearch restart
 
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install: pip install -r requirements_test.txt
 
 # sleep for elasticsearch
 before_script:
-  - sleep 10
+  - wget -q --waitretry=1 --retry-connrefused -T 100 -O - http://127.0.0.1:9200
 
 # command to run tests using coverage, e.g. python setup.py test
 script: tox -e $TOX_ENV -- --elasticsearch

README.rst

@@ -38,8 +38,6 @@ Install Django Elasticsearch DSL::
 
     pip install django-elasticsearch-dsl
 
-    # Elasticsearch 6.x
-    pip install 'elasticsearch-dsl>=6.3.0,<7.0'
 
 
 Then add ``django_elasticsearch_dsl`` to the INSTALLED_APPS