diff --git a/src/auditlog_tests/test_settings.py b/src/auditlog_tests/test_settings.py index 67a1cf1..bbfef12 100644 --- a/src/auditlog_tests/test_settings.py +++ b/src/auditlog_tests/test_settings.py @@ -2,7 +2,6 @@ Settings file for the Auditlog test suite. """ import os -import django SECRET_KEY = 'test' @@ -17,27 +16,17 @@ INSTALLED_APPS = [ 'multiselectfield', ] -middlewares = ( +MIDDLEWARE = [ 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'auditlog.middleware.AuditlogMiddleware', -) - -if django.VERSION < (1, 10): - MIDDLEWARE_CLASSES = middlewares -else: - MIDDLEWARE = middlewares - -if django.VERSION <= (1, 9): - POSTGRES_DRIVER = 'django.db.backends.postgresql_psycopg2' -else: - POSTGRES_DRIVER = 'django.db.backends.postgresql' +] DATABASES = { 'default': { - 'ENGINE': POSTGRES_DRIVER, + 'ENGINE': 'django.db.backends.postgresql', 'NAME': 'auditlog' + os.environ.get("TOX_PARALLEL_ENV", ""), 'USER': 'postgres', 'PASSWORD': '', diff --git a/src/auditlog_tests/urls.py b/src/auditlog_tests/urls.py index c9346f2..d52422e 100644 --- a/src/auditlog_tests/urls.py +++ b/src/auditlog_tests/urls.py @@ -1,13 +1,7 @@ -import django -from django.conf.urls import include, url +from django.conf.urls import url from django.contrib import admin -if django.VERSION < (1, 9): - admin_urls = include(admin.site.urls) -else: - admin_urls = admin.site.urls - urlpatterns = [ - url(r'^admin/', admin_urls), + url(r'^admin/', admin.site.urls), ]