Skip to content

Commit 2fc4f3e

Browse files
committed
Add tox & travis targets for Django 2.2
1 parent 5fc3a5b commit 2fc4f3e

File tree

2 files changed

+26
-37
lines changed

2 files changed

+26
-37
lines changed

.travis.yml

+16-34
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,18 @@
11
language: python
2-
matrix:
3-
include:
4-
- python: 2.7
5-
env: TOX_ENV=py27-django18
6-
- python: 2.7
7-
env: TOX_ENV=py27-django19
8-
- python: 2.7
9-
env: TOX_ENV=py27-django110
10-
- python: 2.7
11-
env: TOX_ENV=py27-django111
12-
13-
- python: 3.4
14-
env: TOX_ENV=py34-django18
15-
- python: 3.4
16-
env: TOX_ENV=py34-django19
17-
- python: 3.4
18-
env: TOX_ENV=py34-django110
19-
- python: 3.4
20-
env: TOX_ENV=py34-django111
21-
22-
- python: 3.5
23-
env: TOX_ENV=py35-django18
24-
- python: 3.5
25-
env: TOX_ENV=py35-django19
26-
- python: 3.5
27-
env: TOX_ENV=py35-django110
28-
- python: 3.5
29-
env: TOX_ENV=py35-django111
30-
31-
- python: 2.7
32-
env: TOX_ENV=flake8
33-
script:
34-
- tox -e $TOX_ENV
2+
dist: xenial
3+
sudo: true
4+
services:
5+
- postgresql
6+
python:
7+
- 2.7
8+
- 3.5
9+
- 3.6
10+
jobs:
11+
- include:
12+
- python: 3.6
13+
env: TOXENV=flake8
3514
install:
36-
pip install tox
15+
- pip install tox
16+
- pip install -q tox-travis
17+
script:
18+
- tox

tox.ini

+10-3
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,30 @@
66
[tox]
77
envlist =
88
py{27,34,35}-django{18,19,110,111},
9+
py{36}-django{20,21,22},
910
flake8
1011

1112
[testenv]
1213
basepython =
1314
py27: python2.7
1415
py34: python3.4
1516
py35: python3.5
17+
py36: python3.6
1618
deps =
17-
django{18,19,110,111}: psycopg2>=2.5.4
19+
coverage
20+
psycopg2>=2.5.4
1821
django18: Django>=1.8,<1.9
1922
django19: Django>=1.9,<1.10
2023
django110: Django>=1.10,<1.11
21-
django111: Django>=1.11,<1.12
24+
django111: Django>=1.11,<2.0
25+
django20: Django>=2.0,<2.1
26+
django21: Django>=2.1,<2.2
27+
django22: Django>=2.2,<3.0
2228
commands =
2329
pip install -e ./
2430
pip install -e demo
25-
demo test -v2 demo django_genericfilters
31+
python -Wd {envbindir}/coverage run --source=django_genericfilters {envbindir}/demo test {posargs:demo django_genericfilters}
32+
coverage report -m
2633
passenv =
2734
PYTHONPATH
2835
DJANGO_DB_USER

0 commit comments

Comments
 (0)