Skip to content

Commit

Permalink
Drop 1.9 support and add the django system checks to the test workflow
Browse files Browse the repository at this point in the history
* Updated tox to perform Django system checks before running tests.
* Removed Django1.9 support (#22)
* tox now performing system checks for django
* Updated the requirements in README
* Drop the support for Django 1.10
  • Loading branch information
flaeppe authored and kjagiello committed Feb 20, 2017
1 parent 26fc0df commit a663d96
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
7 changes: 1 addition & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,20 @@ language: python
sudo: required

install:
- sudo apt-get update
- sudo apt-get install poppler-utils
- pip install tox codecov

matrix:
include:
- python: 3.4
env: ENV=py34-1.9
- python: 3.5
env: ENV=py35-1.10
- python: 3.6
env: ENV=py36-1.11
- python: 3.4
env: ENV=py34-1.9
- python: 3.5
env: ENV=py35-1.10
- python: 3.6
env: ENV=py36-1.11
- python: 3.4
env: ENV=py34-1.9
- python: 3.5
env: ENV=py35-1.10
- python: 3.6
Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ help:
lint:
flake8 --exclude=migrations,settings src/

test:
check:
python src/manage.py check

test: check
python src/manage.py test src/ --settings=foobar.settings.test

coverage:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This repository contains the backend for the FooBar kiosk and inventory system.
## Requirements

- Python 3.4+
- Django 1.9+
- Django 1.10+
- [pdftotext](https://linux.die.net/man/1/pdftotext) for delivery report parsing

## Setup
Expand Down
11 changes: 6 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
[tox]
skipsdist = True
envlist =
py34-{1.9,1.10,1.11},
py35-{1.9,1.10,1.11},
py36-{1.9,1.10,1.11},
py34-{1.10,1.11},
py35-{1.10,1.11},
py36-{1.10,1.11},
flake8
coverage

[testenv]
deps =
-r{toxinidir}/requirements/test.txt
1.9: Django<1.10
1.10: Django<1.11
1.11: Django<1.12
setenv =
DJANGO_SETTINGS_MODULE=foobar.settings.test
commands = python src/manage.py test src/
commands =
python src/manage.py check
python src/manage.py test src/

[testenv:flake8]
deps = flake8
Expand Down

0 comments on commit a663d96

Please sign in to comment.