mirror of
https://github.com/jazzband/django-admin2.git
synced 2026-03-16 22:20:24 +00:00
Update tox and travis configuration with flake8 support
This commit is contained in:
arthur
parent
d3d3fbe991
commit
f5701e5c15
3 changed files with 36 additions and 172 deletions
56
.travis.yml
56
.travis.yml
|
|
@ -1,47 +1,21 @@
|
|||
sudo: false
|
||||
language: python
|
||||
python: "2.7"
|
||||
python:
|
||||
- "2.7"
|
||||
- "3.3"
|
||||
- "3.4"
|
||||
- "3.5"
|
||||
env:
|
||||
matrix:
|
||||
- TOX_ENV=py27-dj1.6.x
|
||||
- TOX_ENV=py27-dj1.7.x
|
||||
- TOX_ENV=py27-dj1.8.x
|
||||
- TOX_ENV=py27-dj1.9.x
|
||||
- TOX_ENV=py33-dj1.6.x
|
||||
- TOX_ENV=py33-dj1.7.x
|
||||
- TOX_ENV=py33-dj1.8.x
|
||||
- TOX_ENV=py33-dj1.9.x
|
||||
- TOX_ENV=py34-dj1.6.x
|
||||
- TOX_ENV=py34-dj1.7.x
|
||||
- TOX_ENV=py34-dj1.8.x
|
||||
- TOX_ENV=py34-dj1.9.x
|
||||
- TOX_ENV=pypy-dj1.6.x
|
||||
- TOX_ENV=pypy-dj1.7.x
|
||||
- TOX_ENV=pypy-dj1.8.x
|
||||
- TOX_ENV=pypy-dj1.9.x
|
||||
- TOX_ENV=pypy3-dj1.6.x
|
||||
- TOX_ENV=pypy3-dj1.8.x
|
||||
- TOX_ENV=pypy3-dj1.9.x
|
||||
- DJANGO=1.8
|
||||
- DJANGO=1.9
|
||||
- DJANGO=master
|
||||
matrix:
|
||||
exclude:
|
||||
- python: "3.3"
|
||||
env: DJANGO=1.9
|
||||
- python: "3.3"
|
||||
env: DJANGO=master
|
||||
install:
|
||||
- pip install tox
|
||||
script:
|
||||
- tox -e $TOX_ENV
|
||||
# for now commented. We have to figure which version use for coverage
|
||||
# and coveralls
|
||||
#after_success:
|
||||
# - coverage report
|
||||
# - pip install --quiet python-coveralls
|
||||
# - coveralls
|
||||
matrix:
|
||||
allow_failures:
|
||||
- env: TOX_ENV=py27-dj1.8.x
|
||||
- env: TOX_ENV=py27-dj1.9.x
|
||||
- env: TOX_ENV=py33-dj1.8.x
|
||||
- env: TOX_ENV=py33-dj1.9.x
|
||||
- env: TOX_ENV=py34-dj1.8.x
|
||||
- env: TOX_ENV=py34-dj1.9.x
|
||||
- env: TOX_ENV=pypy-dj1.8.x
|
||||
- env: TOX_ENV=pypy-dj1.9.x
|
||||
- env: TOX_ENV=pypy3-dj1.8.x
|
||||
- env: TOX_ENV=pypy3-dj1.9.x
|
||||
- env: TOX_ENV=pypy3-dj1.9.x
|
||||
- tox -e py${TRAVIS_PYTHON_VERSION//[.]/}-$DJANGO
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
-rrequirements.txt
|
||||
flake8==2.5.0
|
||||
pytest
|
||||
pytest-django
|
||||
151
tox.ini
151
tox.ini
|
|
@ -1,138 +1,27 @@
|
|||
[flake8]
|
||||
ignore = E265,E501
|
||||
max-line-length = 100
|
||||
max-complexity = 10
|
||||
exclude = migrations/*,docs/*
|
||||
|
||||
[tox]
|
||||
envlist = py27-dj1.6.x, py33-dj1.6.x, py34-dj1.6.x, pypy-dj1.6.x,
|
||||
pypy3-dj1.6.x,
|
||||
py27-dj1.7.x, py33-dj1.7.x, py34-dj1.7.x, pypy-dj1.7.x,
|
||||
pypy3-dj1.7.x,
|
||||
py27-dj1.8.x, py33-dj1.8.x, py34-dj1.8.x, pypy-dj1.8.x,
|
||||
pypy3-dj1.8.x,
|
||||
py27-dj1.9.x, py33-dj1.9.x, py34-dj1.9.x, pypy-dj1.9.x,
|
||||
pypy3-dj1.9.x,
|
||||
skipsdist = True
|
||||
envlist =
|
||||
py27-{1.8,1.9,master},
|
||||
py33-{1.8},
|
||||
py34-{1.8,1.9,master},
|
||||
py35-{1.8,1.9,master}
|
||||
|
||||
[testenv]
|
||||
commands = py.test []
|
||||
deps = -rrequirements_test.txt
|
||||
commands =
|
||||
flake8 djadmin2
|
||||
py.test []
|
||||
deps =
|
||||
-rrequirements_test.txt
|
||||
1.8: Django==1.8
|
||||
1.9: Django>=1.9,<1.10
|
||||
master: https://github.com/django/django/tarball/master
|
||||
usedevelop = True
|
||||
setenv=
|
||||
DJANGO_SETTINGS_MODULE = example.settings
|
||||
PYTHONPATH = {toxinidir}/example:{toxinidir}
|
||||
|
||||
[testenv:py27-dj1.6.x]
|
||||
basepython=python2.7
|
||||
deps =
|
||||
Django>=1.6,<1.7
|
||||
coverage
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:py27-dj1.7.x]
|
||||
basepython=python2.7
|
||||
deps =
|
||||
Django>=1.7,<1.8
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:py33-dj1.6.x]
|
||||
basepython=python3.3
|
||||
deps =
|
||||
Django>=1.6,<1.7
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:py34-dj1.6.x]
|
||||
basepython=python3.4
|
||||
deps =
|
||||
Django>=1.6,<1.7
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:py33-dj1.7.x]
|
||||
basepython=python3.3
|
||||
deps =
|
||||
Django>=1.7,<1.8
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:py34-dj1.7.x]
|
||||
basepython=python3.4
|
||||
deps =
|
||||
Django>=1.7,<1.8
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:pypy-dj1.6.x]
|
||||
basepython=pypy
|
||||
deps =
|
||||
Django>=1.6,<1.7
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:pypy3-dj1.6.x]
|
||||
basepython=pypy3
|
||||
deps =
|
||||
Django>=1.6,<1.7
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:pypy-dj1.7.x]
|
||||
basepython=pypy
|
||||
deps =
|
||||
Django>=1.7,<1.8
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:pypy3-dj1.7.x]
|
||||
basepython=pypy3
|
||||
deps =
|
||||
Django>=1.7,<1.8
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:py27-dj1.8.x]
|
||||
basepython=python2.7
|
||||
deps =
|
||||
Django>=1.8,<1.9
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:py34-dj1.8.x]
|
||||
basepython=python3.4
|
||||
deps =
|
||||
Django>=1.8,<1.9
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:py33-dj1.8.x]
|
||||
basepython=python2.7
|
||||
deps =
|
||||
Django>=1.8,<1.9
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:pypy-dj1.8.x]
|
||||
basepython=pypy
|
||||
deps =
|
||||
Django>=1.8,<1.9
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:pypy3-dj1.8.x]
|
||||
basepython=pypy3
|
||||
deps =
|
||||
Django>=1.8,<1.9
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:py27-dj1.9.x]
|
||||
basepython=python2.7
|
||||
deps =
|
||||
Django>=1.9,<1.9.999
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:py34-dj1.9.x]
|
||||
basepython=python3.4
|
||||
deps =
|
||||
Django>=1.9,<1.9.999
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:py33-dj1.9.x]
|
||||
basepython=python2.7
|
||||
deps =
|
||||
Django>=1.9,<1.9.999
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:pypy-dj1.9.x]
|
||||
basepython=pypy
|
||||
deps =
|
||||
Django>=1.9,<1.9.999
|
||||
{[testenv]deps}
|
||||
|
||||
[testenv:pypy3-dj1.9.x]
|
||||
basepython=pypy3
|
||||
deps =
|
||||
Django>=1.9,<1.9.999
|
||||
{[testenv]deps}
|
||||
|
|
|
|||
Loading…
Reference in a new issue