Merge lp://staging/~lukasz-czyzykowski/django-preflight/latest-django-versions into lp://staging/django-preflight
Proposed by
Łukasz Czyżykowski
| Status: | Merged |
|---|---|
| Approved by: | Łukasz Czyżykowski |
| Approved revision: | 30 |
| Merged at revision: | 24 |
| Proposed branch: | lp://staging/~lukasz-czyzykowski/django-preflight/latest-django-versions |
| Merge into: | lp://staging/django-preflight |
| Diff against target: |
300 lines (+72/-54) 9 files modified
doc/install.rst (+12/-8) example_project/settings.py (+12/-0) preflight/__init__.py (+1/-1) preflight/conf.py (+6/-0) preflight/tests.py (+6/-5) preflight/views.py (+4/-7) setup.py (+2/-3) tox (+0/-6) tox.ini (+29/-24) |
| To merge this branch: | bzr merge lp://staging/~lukasz-czyzykowski/django-preflight/latest-django-versions |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ricardo Kirkner (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Updated code and tests to work with Django 1.5; dropped support for Python 2.5
Description of the change
Updated code and tests to work with the latest Django versions. Also dropped support for Python 2.5, as it's no longer supported by pip[1], and that's what drives tox tests.
[1]: http://
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
l. 54: why not check django's version instead?
Otherwise looks good.