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.7 #312

Merged
merged 12 commits into from
Mar 12, 2015
Merged

Add support for Django 1.7 #312

merged 12 commits into from
Mar 12, 2015

Commits on Mar 11, 2015

  1. Call django.setup if it exists, for 1.7 support 

    Signed-off-by: Andrew Pendleton <apendleton@sunlightfoundation.com>
    @apendleton
    apendleton committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    ae83490 View commit details
    Browse the repository at this point in the history

  2. Make loading of South conditional on Django version, and move South m… 

    …igrations to the new non-conflicting name.

Signed-off-by: Andrew Pendleton <apendleton@sunlightfoundation.com>
    @apendleton
    apendleton committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    ff2ae20 View commit details
    Browse the repository at this point in the history

  3. avocado.events needs to be loaded for its migrations to be generated,… 

    … and it conflicts with the tests.cases.events app, so rename the latter to avoid conflict and update settings accordingly

Signed-off-by: Andrew Pendleton <apendleton@sunlightfoundation.com>
    @apendleton
    apendleton committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    e2f0c01 View commit details
    Browse the repository at this point in the history

  4. Backup creation and failure should exercise the same codepath for det… 

    …ermining the path of the backup

Signed-off-by: Andrew Pendleton <apendleton@sunlightfoundation.com>
    @apendleton
    apendleton committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    584d62c View commit details
    Browse the repository at this point in the history

  5. Handle the switch from allow_syncdb to allow_migrate 

    Signed-off-by: Andrew Pendleton <apendleton@sunlightfoundation.com>
    @apendleton
    apendleton committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    0f3c687 View commit details
    Browse the repository at this point in the history

  6. Skip South-dependent tests on Django 1.7 

    Signed-off-by: Andrew Pendleton <apendleton@sunlightfoundation.com>
    @apendleton
    apendleton committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    caf93a6 View commit details
    Browse the repository at this point in the history

  7. Add empty MIDDLEWARE_CLASSES tuple to suppress warnings about it in t… 

    …he test runner.

Signed-off-by: Andrew Pendleton <apendleton@sunlightfoundation.com>
    @apendleton
    apendleton committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    51a10d2 View commit details
    Browse the repository at this point in the history

  8. Explicitly allow for Django 1.7 in requirements 

    Signed-off-by: Andrew Pendleton <apendleton@sunlightfoundation.com>
    @apendleton
    apendleton committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    f7000b4 View commit details
    Browse the repository at this point in the history

  9. Applying the test patch provided by @bruth in chop-dbhi#311 

    Signed-off-by: Andrew Pendleton <apendleton@sunlightfoundation.com>
    @apendleton
    apendleton committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    8692827 View commit details
    Browse the repository at this point in the history

  10. Whitespace fixes to satisfy flake8 

    Signed-off-by: Andrew Pendleton <apendleton@sunlightfoundation.com>
    @apendleton
    apendleton committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    49d19b2 View commit details
    Browse the repository at this point in the history

  11. Fall back to the copy of unittest.skipIf that comes with Django if th… 

    …e built-in one isn't available.

Signed-off-by: Andrew Pendleton <apendleton@sunlightfoundation.com>
    @apendleton
    apendleton committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    457458a View commit details
    Browse the repository at this point in the history

  12. Add travis tests for Django 1.7 

    Signed-off-by: Andrew Pendleton <apendleton@sunlightfoundation.com>
    @apendleton
    apendleton committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    cf8a961 View commit details
    Browse the repository at this point in the history