Skip to content

Commit

Permalink
Update Python & Django support
Browse files Browse the repository at this point in the history
Update tox & travis configurations to run tests with the full python-django support map (adding django 1.11 & master)
Fix Django 2.0
  • Loading branch information
hsmett committed Sep 11, 2017
1 parent abb1f6e commit 1b58c25
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 22 deletions.
85 changes: 69 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,73 @@
# In order to use the container infrastructure
sudo: false
language: python
# Using Python 3.5 to make sure it's installed.
python:
- 3.5
env:
- TOX_ENV=py27-django18
- TOX_ENV=py27-django19
- TOX_ENV=py27-django110
- TOX_ENV=py34-django18
- TOX_ENV=py34-django19
- TOX_ENV=py34-django110
- TOX_ENV=py35-django18
- TOX_ENV=py35-django19
- TOX_ENV=py35-django110
- TOX_ENV=flake8
script: tox -e $TOX_ENV
matrix:
fast_finish: true
include:
# Python version is just for the look on travis.
- python: 2.7
env: TOXENV=flake8-py27

- python: 3.4
env: TOXENV=flake8-py34

- python: 2.7
env: TOXENV=py27-dj18

- python: 2.7
env: TOXENV=py27-dj19

- python: 2.7
env: TOXENV=py27-dj110

- python: 2.7
env: TOXENV=py27-dj111

- python: 3.3
env: TOXENV=py33-dj18

- python: 3.4
env: TOXENV=py34-dj18

- python: 3.4
env: TOXENV=py34-dj19

- python: 3.4
env: TOXENV=py34-dj110

- python: 3.4
env: TOXENV=py34-dj111

- python: 3.4
env: TOXENV=py34-djangomaster

- python: 3.5
env: TOXENV=py35-dj18

- python: 3.5
env: TOXENV=py35-dj19

- python: 3.5
env: TOXENV=py35-dj110

- python: 3.5
env: TOXENV=py35-dj111

- python: 3.5
env: TOXENV=py35-djangomaster

- python: 3.6
env: TOXENV=py36-dj111

- python: 3.6
env: TOXENV=py36-djangomaster

allow_failures:
- env: TOXENV=py34-djangomaster
- env: TOXENV=py35-djangomaster
- env: TOXENV=py36-djangomaster

install:
- pip install tox

script:
- tox -e $TOXENV
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# master (unreleased)

Nothing here yet, stay tuned.
- Run tox with Django 1.11

# 1.2.0 (2017-07-03)

Expand Down
6 changes: 4 additions & 2 deletions demo/demo_chunkator/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ class Meta:


class Cover(models.Model):
book = models.OneToOneField(Book, primary_key=True)
book = models.OneToOneField(Book, primary_key=True,
on_delete=models.CASCADE)
code = models.CharField(max_length=20)


Expand All @@ -25,5 +26,6 @@ class Meta:


class Profile(models.Model):
user = models.OneToOneField(User, primary_key=True)
user = models.OneToOneField(User, primary_key=True,
on_delete=models.CASCADE)
avatar = models.CharField(max_length=100)
2 changes: 2 additions & 0 deletions demo/demo_chunkator/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

urlpatterns = []
24 changes: 21 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,17 +1,35 @@
[tox]
envlist = {py27,py34,py35}-django{18,19,110},flake8
envlist =
flake8-py27,
flake8-py35,
py{27,33,34,35}-django18,
py{27,34,35}-{django19,django110},
py{27,34,35,36}-django111,
py{34,35,36}-djangomaster

[testenv]
basepython =
py27: python2.7
py33: python3.3
py34: python3.4
py35: python3.5
py36: python3.6
usedevelop = True
deps =
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10,<1.11
flake8: flake8
django111: Django>=1.11,<2.0
djangomaster: https://github.com/django/django/archive/master.tar.gz#egg=django
commands =
python --version
pip install -e demo/
rundemo test demo_chunkator

[testenv:flake8]
[testenv:flake8-py27]
commands = flake8 chunkator
deps = flake8

[testenv:flake8-py35]
commands = flake8 chunkator
deps = flake8

0 comments on commit 1b58c25

Please sign in to comment.