Skip to content

Commit 192d226

Browse files
barseghyanarturbarseghyanartur
authored
Merge pull request #173 from barseghyanartur/feature/172-Test-on-Travis-against-multiple-versions-of-Elasticsearch
Feature/172 test on travis against multiple versions of elasticsearch
2 parents 7557fcb + 85aec12 commit 192d226

File tree

3 files changed

+56
-20
lines changed

3 files changed

+56
-20
lines changed

‎.travis.yml‎

Lines changed: 47 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,70 @@ language: python
88
matrix:
99
fast_finish: true
1010
include:
11-
- env: TOX_ENV=py27-django111
11+
- env: TOX_ENV=py27-django111-elasticsearch7
1212
python: 2.7
1313

14-
- env: TOX_ENV=py35-django20
14+
- env: TOX_ENV=py27-django111-elasticsearch6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
15+
python: 2.7
16+
17+
- env: TOX_ENV=py35-django20-elasticsearch7
1518
python: 3.5
1619

17-
- env: TOX_ENV=py36-django111
20+
- env: TOX_ENV=py35-django20-elasticsearch6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
21+
python: 3.5
22+
23+
- env: TOX_ENV=py36-django111-elasticsearch7
24+
python: 3.6
25+
- env: TOX_ENV=py36-django20-elasticsearch7
26+
python: 3.6
27+
- env: TOX_ENV=py36-django21-elasticsearch7
28+
python: 3.6
29+
- env: TOX_ENV=py36-django22-elasticsearch7
30+
python: 3.6
31+
- env: TOX_ENV=py36-django30-elasticsearch7
32+
python: 3.6
33+
34+
- env: TOX_ENV=py36-django111-elasticsearch6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
1835
python: 3.6
19-
- env: TOX_ENV=py36-django20
36+
- env: TOX_ENV=py36-django20-elasticsearch6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
2037
python: 3.6
21-
- env: TOX_ENV=py36-django21
38+
- env: TOX_ENV=py36-django21-elasticsearch6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
2239
python: 3.6
23-
- env: TOX_ENV=py36-django22
40+
- env: TOX_ENV=py36-django22-elasticsearch6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
2441
python: 3.6
25-
- env: TOX_ENV=py36-django30
42+
- env: TOX_ENV=py36-django30-elasticsearch6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
2643
python: 3.6
2744

28-
- env: TOX_ENV=py37-django20
45+
- env: TOX_ENV=py37-django20-elasticsearch7
2946
python: 3.7
30-
- env: TOX_ENV=py37-django21
47+
- env: TOX_ENV=py37-django21-elasticsearch7
3148
python: 3.7
32-
- env: TOX_ENV=py37-django22
49+
- env: TOX_ENV=py37-django22-elasticsearch7
3350
python: 3.7
34-
- env: TOX_ENV=py37-django30
51+
- env: TOX_ENV=py37-django30-elasticsearch7
3552
python: 3.7
3653

37-
- env: TOX_ENV=py38-django111
54+
- env: TOX_ENV=py37-django20-elasticsearch6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
55+
python: 3.7
56+
- env: TOX_ENV=py37-django21-elasticsearch6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
57+
python: 3.7
58+
- env: TOX_ENV=py37-django22-elasticsearch6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
59+
python: 3.7
60+
- env: TOX_ENV=py37-django30-elasticsearch6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
61+
python: 3.7
62+
63+
- env: TOX_ENV=py38-django111-elasticsearch7
64+
python: 3.8
65+
- env: TOX_ENV=py38-django22-elasticsearch7
66+
python: 3.8
67+
- env: TOX_ENV=py38-django30-elasticsearch7
68+
python: 3.8
69+
70+
- env: TOX_ENV=py38-django111-elasticsearch6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
3871
python: 3.8
39-
- env: TOX_ENV=py38-django22
72+
- env: TOX_ENV=py38-django22-elasticsearch6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
4073
python: 3.8
41-
- env: TOX_ENV=py38-django30
74+
- env: TOX_ENV=py38-django30-elasticsearch6 ES_APT_URL=https://artifacts.elastic.co/packages/6.x/apt
4275
python: 3.8
4376

4477
env:

‎examples/requirements/common.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-r elastic.txt
1+
#-r elastic.txt
22

33
python-memcached==1.58
44
pytz

‎tox.ini‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[tox]
22
envlist =
3-
py{27,35,36}-{django111}
4-
py{35,36}-{django20}
5-
py{36,37,38}-{django111,django20,django21,django22,django30}-{none,coreapischema}
3+
py{27,35,36}-{django111}-elasticsearch{6,7}
4+
py{35,36}-{django20}-elasticsearch{6,7}
5+
; py{36,37,38}-{django111,django20,django21,django22,django30}-{none,coreapischema}
6+
py{36,37,38}-{django111,django20,django21,django22,django30}-elasticsearch{6,7}
67

78
[testenv]
89
envlogdir=
@@ -16,8 +17,10 @@ deps =
1617
django21: -r{toxinidir}/examples/requirements/django_2_1.txt
1718
django22: -r{toxinidir}/examples/requirements/django_2_2.txt
1819
django30: -r{toxinidir}/examples/requirements/django_3_0.txt
19-
coreapischema: -r{toxinidir}/examples/requirements/coreapi_coreschema.txt
20-
none: -r{toxinidir}/examples/requirements/none.txt
20+
elasticsearch6: -r{toxinidir}/examples/requirements/elastic_6x.txt
21+
elasticsearch7: -r{toxinidir}/examples/requirements/elastic_7x.txt
22+
; coreapischema: -r{toxinidir}/examples/requirements/coreapi_coreschema.txt
23+
; none: -r{toxinidir}/examples/requirements/none.txt
2124
commands =
2225
{envpython} runtests.py {posargs}
2326
; {envpython} examples/simple/manage.py test {posargs:django_elasticsearch_dsl_drf} --settings=settings.testing --traceback -v 3

0 commit comments

Comments
 (0)