Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Confirm Django 2.2 compatibility #33

Merged
merged 2 commits into from
Apr 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
66 changes: 10 additions & 56 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,64 +1,18 @@
dist: xenial
sudo: false
language: python
matrix:
fast_finish: true
include:
# Python version is just for the look on travis.
- python: 2.7
env: TOXENV=flake8-py27

- python: 3.5
env: TOXENV=flake8-py35

- python: 2.7
env: TOXENV=py27-django111

- python: 3.5
env: TOXENV=py35-django111

- python: 3.5
env: TOXENV=py35-django20

- python: 3.5
env: TOXENV=py35-django21

- python: 3.5
env: TOXENV=py35-djangomaster

- python: 3.6
env: TOXENV=py36-django111
python:
- 2.7
- 3.5
- 3.6
- 3.7

- python: 3.6
env: TOXENV=py36-django20

- python: 3.6
env: TOXENV=py36-django21

- python: 3.6
env: TOXENV=py36-djangomaster

- python: 3.7
env: TOXENV=py37-django20
dist: xenial
sudo: true

- python: 3.7
env: TOXENV=py37-django21
dist: xenial
sudo: true

- python: 3.7
env: TOXENV=py37-djangomaster
dist: xenial
sudo: true

allow_failures:
- env: TOXENV=py35-djangomaster
- env: TOXENV=py36-djangomaster
- env: TOXENV=py37-djangomaster
matrix:
fast_finish: true

install:
- pip install tox
- pip install tox tox-travis

script:
- tox -e $TOXENV
- tox -r
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 to see here yet.
- Confirm support for Django 2.2

## 1.4.0 (2018-12-17)

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ your RAM.
Tested with all the combinations of:

* Python: 2.7, 3.5, 3.6, 3.7
* Django: 1.11, 2, 2.1, master
* Django: 1.11, 2, 2.1, 2.2, master


Usage
Expand Down
28 changes: 20 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
[tox]
envlist =
flake8-py27,
flake8-py35,
py{27,35}-flake8,
py{27,35,36}-django111,
py{35,36,37}-django20,
py{35,36,37}-django21,
py{35,36,37}-djangomaster
py{35,36,37}-django{20,21,22}
py{36,37}-djangomaster

[testenv]
basepython =
Expand All @@ -18,16 +16,30 @@ deps =
django111: Django>=1.11,<2.0
django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2
django22: Django>=2.2,<3.0
djangomaster: https://github.com/django/django/archive/master.tar.gz#egg=django
commands =
python --version
pip install -e demo/
rundemo test demo_chunkator
python -Wd {envbindir}/rundemo test {posargs:demo_chunkator}

[testenv:flake8-py27]
[travis]
python =
2.7: py27
3.5: py35
3.6: py36
3.7: py37

[testenv:py36-djangomaster]
ignore_outcome=true

[testenv:py37-djangomaster]
ignore_outcome=true

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

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