~netlandish/django-wiki

018074b62800e2ec91abc6e3cb36f73bc1d4f6c1 — Benjamin Bach 6 years ago 22d5a7d
Add Django 2.1 to test matrix
3 files changed, 7 insertions(+), 2 deletions(-)

M .travis.yml
M setup.py
M tox.ini
M .travis.yml => .travis.yml +3 -0
@@ 13,9 13,12 @@ env:
  - LINT="yes"
  - DJANGO="1.11"
  - DJANGO="2.0"
  - DJANGO="2.1"

matrix:
  exclude:
  - python: "3.4"
    env: DJANGO="2.1"
  - python: "3.5"
    env: LINT="yes"
  - python: "3.6"

M setup.py => setup.py +1 -1
@@ 24,7 24,7 @@ def get_path(fname):


install_requirements = [
    "Django>=1.11,<2.1.1",
    "Django>=1.11,<2.2",
    "bleach>=2.1,<2.2",
    "Pillow",
    "django-nyt>=1.1.1,<1.2",

M tox.ini => tox.ini +3 -1
@@ 1,6 1,6 @@
[tox]
# Ensure you add to .travis.yml if you add here, using `tox -l`
envlist = {py34,py35,py36}-django{111,20},lint
envlist = {py34,py35,py36}-django{111,20,21},lint


[travis]


@@ 13,6 13,7 @@ python =
DJANGO =
  1.11: django111
  2.0: django20
  2.1: django21
LINT =
  yes: lint



@@ 35,6 36,7 @@ deps =
  .[test]
  django111: Django>=1.11,<2.0
  django20: Django>=2.0,<2.1
  django21: Django>=2.1,<2.2

basepython =
  py34: python3.4