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
This commit is contained in:
Carlton Gibson 2017-09-27 10:29:48 +02:00 committed by GitHub
parent b1c6ea1240
commit 296904099f
7 changed files with 19 additions and 19 deletions

View File

@ -8,10 +8,9 @@ python:
sudo: false sudo: false
env: env:
- DJANGO=1.8
- DJANGO=1.9
- DJANGO=1.10 - DJANGO=1.10
- DJANGO=1.11 - DJANGO=1.11
- DJANGO=2.0
- DJANGO=master - DJANGO=master
matrix: matrix:
@ -21,8 +20,8 @@ matrix:
env: DJANGO=master env: DJANGO=master
- python: "3.6" - python: "3.6"
env: DJANGO=1.11 env: DJANGO=1.11
- python: "3.3" - python: "3.6"
env: DJANGO=1.8 env: DJANGO=2.0
- python: "2.7" - python: "2.7"
env: TOXENV="lint" env: TOXENV="lint"
- python: "2.7" - python: "2.7"
@ -30,11 +29,14 @@ matrix:
exclude: exclude:
- python: "2.7" - python: "2.7"
env: DJANGO=master env: DJANGO=master
- python: "2.7"
env: DJANGO=2.0
- python: "3.4" - python: "3.4"
env: DJANGO=master env: DJANGO=master
allow_failures: allow_failures:
- env: DJANGO=master - env: DJANGO=master
- env: DJANGO=2.0
install: install:
- pip install tox tox-travis - pip install tox tox-travis

View File

@ -1,7 +1,7 @@
# PEP8 code linting, which we run on all commits. # PEP8 code linting, which we run on all commits.
flake8==2.4.0 flake8==3.4.1
flake8-tidy-imports==1.1.0 flake8-tidy-imports==1.1.0
pep8==1.5.7 pep8==1.7.0
# Sort and lint imports # Sort and lint imports
isort==4.2.5 isort==4.2.5

View File

@ -1,2 +1,2 @@
# MkDocs to build our documentation. # MkDocs to build our documentation.
mkdocs==0.16.2 mkdocs==0.16.3

View File

@ -1,7 +1,7 @@
# Optional packages which may be used with REST framework. # Optional packages which may be used with REST framework.
pytz==2017.2 pytz==2017.2
markdown==2.6.4 markdown==2.6.4
django-guardian==1.4.8 django-guardian==1.4.9
django-filter==1.0.4 django-filter==1.0.4
coreapi==2.2.4 coreapi==2.3.1
coreschema==0.0.4 coreschema==0.0.4

View File

@ -1,8 +1,8 @@
# Wheel for PyPI installs. # Wheel for PyPI installs.
wheel==0.29.0 wheel==0.30.0
# Twine for secured PyPI uploads. # Twine for secured PyPI uploads.
twine==1.6.5 twine==1.9.1
# Transifex client for managing translation resources. # Transifex client for managing translation resources.
transifex-client==0.11 transifex-client==0.11

View File

@ -1,4 +1,4 @@
# PyTest for running the tests. # PyTest for running the tests.
pytest==3.0.5 pytest==3.2.2
pytest-django==3.1.2 pytest-django==3.1.2
pytest-cov==2.4.0 pytest-cov==2.5.1

10
tox.ini
View File

@ -3,18 +3,17 @@ addopts=--tb=short
[tox] [tox]
envlist = envlist =
{py27,py33,py34,py35}-django18, {py27,py34,py35}-django110,
{py27,py34,py35}-django{19,110},
{py27,py34,py35,py36}-django111, {py27,py34,py35,py36}-django111,
{py34,py35,py36}-django20,
{py35,py36}-djangomaster {py35,py36}-djangomaster
lint,docs lint,docs
[travis:env] [travis:env]
DJANGO = DJANGO =
1.8: django18
1.9: django19
1.10: django110 1.10: django110
1.11: django111 1.11: django111
2.0: django20
master: djangomaster master: djangomaster
[testenv] [testenv]
@ -23,10 +22,9 @@ setenv =
PYTHONDONTWRITEBYTECODE=1 PYTHONDONTWRITEBYTECODE=1
PYTHONWARNINGS=once PYTHONWARNINGS=once
deps = deps =
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10,<1.11 django110: Django>=1.10,<1.11
django111: Django>=1.11,<2.0 django111: Django>=1.11,<2.0
django20: Django>=2.0a1,<2.1
djangomaster: https://github.com/django/django/archive/master.tar.gz djangomaster: https://github.com/django/django/archive/master.tar.gz
-rrequirements/requirements-testing.txt -rrequirements/requirements-testing.txt
-rrequirements/requirements-optionals.txt -rrequirements/requirements-optionals.txt