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.

Sign up for GitHub

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

Dropping Django 1.9 support & test improvements #22

Merged
merged 4 commits into from
Feb 20, 2017
Merged

Dropping Django 1.9 support & test improvements #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
429d555
tox now performing system checks for django
flaeppe Feb 20, 2017
677313c
Added target for performing Django system check
flaeppe Feb 20, 2017
872fa7f
Updated readme
flaeppe Feb 20, 2017
3afb495
Removed tox compability support checking. Now only testing > Django1.10
flaeppe Feb 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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