Skip to content
This repository has been archived by the owner on Jan 18, 2020. It is now read-only.

Add support for Django 1.6 #14

Merged
merged 6 commits into from
Aug 26, 2014
Merged

Add support for Django 1.6 #14

merged 6 commits into from
Aug 26, 2014

Conversation

naegelyd
Copy link
Collaborator

Fix #11.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.91%) when pulling 8df4308 on issue-11 into b8a90e8 on master.

Don Naegely and others added 6 commits August 26, 2014 12:41
Django 1.6 uses a new test runner which requires tests to be in files
that start with "test". Django 1.5 and earlier would find these in the
tests/ directory but that is no longer the case so we add the test_
prefix which has no negative effects in Django <= 1.5 but allows the
test runner to find them in Django >= 1.6.

Signed-off-by: Don Naegely <naegelyd@email.chop.edu>
Signed-off-by: Don Naegely <naegelyd@email.chop.edu>
This is a new data structure that includes the column and the field
instance.

Signed-off-by: Byron Ruth <b@devel.io>
Django >= 1.6 requires the full test module while Django <= 1.5 could
get by with just the name. The test_suite.py now adds the prefix when it
detects a django version that requires it.

Add Django 1.6.6 to TravisCI build matrix

Signed-off-by: Don Naegely <naegelyd@email.chop.edu>
Also updates the formatting of the long SQL statements to make them
easier to read.

Signed-off-by: Don Naegely <naegelyd@email.chop.edu>
Signed-off-by: Byron Ruth <b@devel.io>
@coveralls
Copy link

Coverage Status

Coverage increased (+0.91%) when pulling cb8b7cd on issue-11 into b8a90e8 on master.

bruth added a commit that referenced this pull request Aug 26, 2014
Add support for Django 1.6
@bruth bruth merged commit 2982b10 into master Aug 26, 2014
@bruth bruth deleted the issue-11 branch August 26, 2014 17:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add support for Django 1.6
3 participants