Skip to content

Commit 2969040

Browse files
author
Carlton Gibson
authored
Update test matrix: Add Django 2.0, drop 1.8 (#5457)
* Add Django 2.0 to tox/travis. Updated requirements * Drop Django 1.8 & 1.9
1 parent b1c6ea1 commit 2969040

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

.travis.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ python:
88
sudo: false
99

1010
env:
11-
- DJANGO=1.8
12-
- DJANGO=1.9
1311
- DJANGO=1.10
1412
- DJANGO=1.11
13+
- DJANGO=2.0
1514
- DJANGO=master
1615

1716
matrix:
@@ -21,20 +20,23 @@ matrix:
2120
env: DJANGO=master
2221
- python: "3.6"
2322
env: DJANGO=1.11
24-
- python: "3.3"
25-
env: DJANGO=1.8
23+
- python: "3.6"
24+
env: DJANGO=2.0
2625
- python: "2.7"
2726
env: TOXENV="lint"
2827
- python: "2.7"
2928
env: TOXENV="docs"
3029
exclude:
3130
- python: "2.7"
3231
env: DJANGO=master
32+
- python: "2.7"
33+
env: DJANGO=2.0
3334
- python: "3.4"
3435
env: DJANGO=master
3536

3637
allow_failures:
3738
- env: DJANGO=master
39+
- env: DJANGO=2.0
3840

3941
install:
4042
- pip install tox tox-travis
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# PEP8 code linting, which we run on all commits.
2-
flake8==2.4.0
2+
flake8==3.4.1
33
flake8-tidy-imports==1.1.0
4-
pep8==1.5.7
4+
pep8==1.7.0
55

66
# Sort and lint imports
77
isort==4.2.5
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# MkDocs to build our documentation.
2-
mkdocs==0.16.2
2+
mkdocs==0.16.3
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Optional packages which may be used with REST framework.
22
pytz==2017.2
33
markdown==2.6.4
4-
django-guardian==1.4.8
4+
django-guardian==1.4.9
55
django-filter==1.0.4
6-
coreapi==2.2.4
6+
coreapi==2.3.1
77
coreschema==0.0.4

requirements/requirements-packaging.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Wheel for PyPI installs.
2-
wheel==0.29.0
2+
wheel==0.30.0
33

44
# Twine for secured PyPI uploads.
5-
twine==1.6.5
5+
twine==1.9.1
66

77
# Transifex client for managing translation resources.
88
transifex-client==0.11

requirements/requirements-testing.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# PyTest for running the tests.
2-
pytest==3.0.5
2+
pytest==3.2.2
33
pytest-django==3.1.2
4-
pytest-cov==2.4.0
4+
pytest-cov==2.5.1

tox.ini

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@ addopts=--tb=short
33

44
[tox]
55
envlist =
6-
{py27,py33,py34,py35}-django18,
7-
{py27,py34,py35}-django{19,110},
6+
{py27,py34,py35}-django110,
87
{py27,py34,py35,py36}-django111,
8+
{py34,py35,py36}-django20,
99
{py35,py36}-djangomaster
1010
lint,docs
1111

1212
[travis:env]
1313
DJANGO =
14-
1.8: django18
15-
1.9: django19
1614
1.10: django110
1715
1.11: django111
16+
2.0: django20
1817
master: djangomaster
1918

2019
[testenv]
@@ -23,10 +22,9 @@ setenv =
2322
PYTHONDONTWRITEBYTECODE=1
2423
PYTHONWARNINGS=once
2524
deps =
26-
django18: Django>=1.8,<1.9
27-
django19: Django>=1.9,<1.10
2825
django110: Django>=1.10,<1.11
2926
django111: Django>=1.11,<2.0
27+
django20: Django>=2.0a1,<2.1
3028
djangomaster: https://github.com/django/django/archive/master.tar.gz
3129
-rrequirements/requirements-testing.txt
3230
-rrequirements/requirements-optionals.txt

0 commit comments

Comments
 (0)