~netlandish/django-wiki

bca691dd9347086a139c198495a2d01f8ea7ed89 — Benjamin Bach 5 years ago d98c474 + 1f6de54
Merge branch 'master' into add-django-2-2
2 files changed, 2 insertions(+), 18 deletions(-)

M .travis.yml
M tox.ini
M .travis.yml => .travis.yml +0 -13
@@ 4,19 4,6 @@ language: python

matrix:
  include:
  - python: 3.4
    dist: trusty
    sudo: false
    env: LINT="yes"
  - python: 3.4
    dist: trusty
    sudo: false
    env: DJANGO="1.11"
  - python: 3.4
    dist: trusty
    sudo: false
    env: DJANGO="2.0"

  - python: 3.5
    dist: trusty
    sudo: false

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

envlist = {py35,py36}-django{111,20,21,22},py37-django{20,21,22},lint

[travis]
python =
  3.4: py34
  3.5: py35
  3.6: py36
  3.7: py37


@@ 42,14 40,13 @@ deps =
  django22: Django>=2.2,<2.3

basepython =
  py34: python3.4
  py35: python3.5
  py36: python3.6
  py37: python3.7


[testenv:lint]
basepython = python3.4
basepython = python3
deps = .[testlint]
commands =
  flake8 src/wiki