Call django.setup() after user pytest_configure().

Also, call django.setup() early if Django settings is already configured
externally.

Author: pelme

pytest_django/plugin.py

@@ -125,6 +125,9 @@ def _add_django_project_to_path(args):
 
 
 def _setup_django():
+    if 'django' not in sys.modules:
+        return
+
     import django
 
     if hasattr(django, 'setup'):
@@ -217,7 +220,14 @@ def pytest_load_initial_conftests(early_config, parser, args):
         with _handle_import_error(_django_project_scan_outcome):
             settings.DATABASES
 
-        _setup_django()
+    _setup_django()
+
+
+@pytest.mark.trylast
+def pytest_configure():
+    # Allow Django settings to be configured in a user pytest_configure call,
+    # but make sure we call django.setup()
+    _setup_django()
 
 
 def pytest_runtest_setup(item):

tests/test_django_settings_module.py

@@ -132,7 +132,6 @@ def test_django_settings_configure(testdir, monkeypatch):
     monkeypatch.delenv('DJANGO_SETTINGS_MODULE')
 
     p = testdir.makepyfile(run="""
-            import django
             from django.conf import settings
             settings.configure(SECRET_KEY='set from settings.configure()',
                                DATABASES={'default': {
@@ -142,9 +141,6 @@ def test_django_settings_configure(testdir, monkeypatch):
                                INSTALLED_APPS=['django.contrib.auth',
                                                'django.contrib.contenttypes',])
 
-            if hasattr(django, 'setup'):
-                django.setup()
-
             import pytest
 
             pytest.main()