From 429d55525cda463ec34b4760d41938e721e33f13 Mon Sep 17 00:00:00 2001 From: Petter Friberg Date: Mon, 20 Feb 2017 14:32:08 +0100 Subject: [PATCH 1/4] tox now performing system checks for django --- tox.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 1699744..4658a6e 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,9 @@ deps = 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 From 677313c74306cc9c2ab6ccee2d18aa976b9e0fa7 Mon Sep 17 00:00:00 2001 From: Petter Friberg Date: Mon, 20 Feb 2017 14:33:41 +0100 Subject: [PATCH 2/4] Added target for performing Django system check --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 64968b9..0ed0c35 100644 --- a/Makefile +++ b/Makefile @@ -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: From 872fa7f056e394ca231fe4866a9fedd950ab7634 Mon Sep 17 00:00:00 2001 From: Petter Friberg Date: Mon, 20 Feb 2017 14:34:29 +0100 Subject: [PATCH 3/4] Updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ca40568..dd5425b 100644 --- a/README.md +++ b/README.md @@ -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 From 3afb49575f62ed8893ac609b194e0f017aa2f7d5 Mon Sep 17 00:00:00 2001 From: Petter Friberg Date: Mon, 20 Feb 2017 14:39:29 +0100 Subject: [PATCH 4/4] Removed tox compability support checking. Now only testing > Django1.10 --- tox.ini | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 4658a6e..6431b81 100644 --- a/tox.ini +++ b/tox.ini @@ -1,16 +1,15 @@ [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 =