Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update test matrix: Add Django 2.0, drop 1.8 #5457

Merged
merged 2 commits into from
Sep 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ python:
sudo: false

env:
- DJANGO=1.8
- DJANGO=1.9
- DJANGO=1.10
- DJANGO=1.11
- DJANGO=2.0
- DJANGO=master

matrix:
Expand All @@ -21,20 +20,23 @@ matrix:
env: DJANGO=master
- python: "3.6"
env: DJANGO=1.11
- python: "3.3"
env: DJANGO=1.8
- python: "3.6"
env: DJANGO=2.0
- python: "2.7"
env: TOXENV="lint"
- python: "2.7"
env: TOXENV="docs"
exclude:
- python: "2.7"
env: DJANGO=master
- python: "2.7"
env: DJANGO=2.0
- python: "3.4"
env: DJANGO=master

allow_failures:
- env: DJANGO=master
- env: DJANGO=2.0

install:
- pip install tox tox-travis
Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements-codestyle.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# PEP8 code linting, which we run on all commits.
flake8==2.4.0
flake8==3.4.1
flake8-tidy-imports==1.1.0
pep8==1.5.7
pep8==1.7.0

# Sort and lint imports
isort==4.2.5
2 changes: 1 addition & 1 deletion requirements/requirements-documentation.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# MkDocs to build our documentation.
mkdocs==0.16.2
mkdocs==0.16.3
4 changes: 2 additions & 2 deletions requirements/requirements-optionals.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Optional packages which may be used with REST framework.
pytz==2017.2
markdown==2.6.4
django-guardian==1.4.8
django-guardian==1.4.9
django-filter==1.0.4
coreapi==2.2.4
coreapi==2.3.1
coreschema==0.0.4
4 changes: 2 additions & 2 deletions requirements/requirements-packaging.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Wheel for PyPI installs.
wheel==0.29.0
wheel==0.30.0

# Twine for secured PyPI uploads.
twine==1.6.5
twine==1.9.1

# Transifex client for managing translation resources.
transifex-client==0.11
Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements-testing.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# PyTest for running the tests.
pytest==3.0.5
pytest==3.2.2
pytest-django==3.1.2
pytest-cov==2.4.0
pytest-cov==2.5.1
10 changes: 4 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@ addopts=--tb=short

[tox]
envlist =
{py27,py33,py34,py35}-django18,
{py27,py34,py35}-django{19,110},
{py27,py34,py35}-django110,
{py27,py34,py35,py36}-django111,
{py34,py35,py36}-django20,
{py35,py36}-djangomaster
lint,docs

[travis:env]
DJANGO =
1.8: django18
1.9: django19
1.10: django110
1.11: django111
2.0: django20
master: djangomaster

[testenv]
Expand All @@ -23,10 +22,9 @@ setenv =
PYTHONDONTWRITEBYTECODE=1
PYTHONWARNINGS=once
deps =
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10,<1.11
django111: Django>=1.11,<2.0
django20: Django>=2.0a1,<2.1
djangomaster: https://github.com/django/django/archive/master.tar.gz
-rrequirements/requirements-testing.txt
-rrequirements/requirements-optionals.txt
Expand Down