Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Upgrade Django support to updated versions
* Drop support for Django < 1.8, add support for 1.10+ * Add support for running tox locally with Docker
- Loading branch information
Showing
7 changed files
with
158 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
# Git | ||
.git | ||
.gitignore | ||
|
||
# CI | ||
.codeclimate.yml | ||
.travis.yml | ||
|
||
# Docker | ||
docker-compose.yml | ||
|
||
# Byte-compiled / optimized / DLL files | ||
__pycache__/ | ||
*/__pycache__/ | ||
*/*/__pycache__/ | ||
*/*/*/__pycache__/ | ||
*.py[cod] | ||
*/*.py[cod] | ||
*/*/*.py[cod] | ||
*/*/*/*.py[cod] | ||
|
||
# C extensions | ||
*.so | ||
|
||
# Distribution / packaging | ||
.Python | ||
env/ | ||
build/ | ||
develop-eggs/ | ||
dist/ | ||
downloads/ | ||
eggs/ | ||
lib/ | ||
lib64/ | ||
parts/ | ||
sdist/ | ||
var/ | ||
*.egg-info/ | ||
.installed.cfg | ||
*.egg | ||
|
||
# PyInstaller | ||
# Usually these files are written by a python script from a template | ||
# before PyInstaller builds the exe, so as to inject date/other infos into it. | ||
*.manifest | ||
*.spec | ||
|
||
# Installer logs | ||
pip-log.txt | ||
pip-delete-this-directory.txt | ||
|
||
# Unit test / coverage reports | ||
htmlcov/ | ||
.tox/ | ||
.coverage | ||
.cache | ||
nosetests.xml | ||
coverage.xml | ||
|
||
# Translations | ||
*.mo | ||
*.pot | ||
|
||
# Django stuff: | ||
*.log | ||
|
||
# Sphinx documentation | ||
docs/_build/ | ||
|
||
# PyBuilder | ||
target/ | ||
|
||
# Virtual environment | ||
.env/ | ||
.venv/ | ||
venv/ | ||
|
||
# PyCharm | ||
.idea | ||
|
||
# Python mode for VIM | ||
.ropeproject | ||
*/.ropeproject | ||
*/*/.ropeproject | ||
*/*/*/.ropeproject | ||
|
||
# Vim swap files | ||
*.swp | ||
*/*.swp | ||
*/*/*.swp | ||
*/*/*/*.swp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
FROM themattrix/tox | ||
|
||
MAINTAINER Brad Jasper <bjasper@gmail.com> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
tox: | ||
build: . | ||
volumes: | ||
- ".:/src:ro" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,32 @@ | ||
[flake8] | ||
# ignore = E265,E501 | ||
max-line-length = 115 | ||
max-complexity = 10 | ||
# exclude = migrations/*,docs/* | ||
|
||
[tox] | ||
envlist = | ||
py27-{1.4,1.5,1.6,1.7,1.8,1.9,master}, | ||
py32-{1.5,1.6,1.7,1.8}, | ||
py33-{1.5,1.6,1.7,1.8}, | ||
py34-{1.7,1.8,1.9,master}, | ||
py35-{1.8,1.9,master} | ||
py27-{1.8,1.9,1.10}, | ||
py33-{1.8}, | ||
py34-{1.8,1.9,1.10}, | ||
py35-{1.8,1.9,1.10,master}, | ||
py36-{master} | ||
skipsdist = {env:TOXBUILD:false} | ||
|
||
[testenv] | ||
deps = | ||
py{27,33,34,35}: coverage == 4.0.2 | ||
py32: coverage == 3.7.1 | ||
flake8 == 2.5.0 | ||
1.4: Django>=1.4,<1.5 | ||
1.5: Django>=1.5,<1.6 | ||
1.6: Django>=1.6,<1.7 | ||
1.7: Django>=1.7,<1.8 | ||
coverage==4.3.4 | ||
flake8==3.3.0 | ||
1.8: Django>=1.8,<1.9 | ||
1.9: Django>=1.9,<1.10 | ||
1.10: Django>=1.10,<1.11 | ||
master: https://github.com/django/django/tarball/master | ||
usedevelop = True | ||
setenv = | ||
LANG=en_US.UTF-8 | ||
LANGUAGE=en_US:en | ||
LC_ALL=en_US.UTF-8 | ||
LANG=en_US.UTF-8 | ||
LANGUAGE=en_US:en | ||
LC_ALL=en_US.UTF-8 | ||
whitelist_externals = | ||
true | ||
commands = | ||
flake8 jsonfield | ||
coverage run setup.py test | ||
{env:TOXBUILD:flake8 jsonfield} | ||
{env:TOXBUILD:coverage run setup.py test} | ||
|
||
[flake8] | ||
# ignore = E265,E501 | ||
max-line-length = 115 | ||
max-complexity = 10 | ||
# exclude = migrations/*,docs/* |