From edec83e85e80bac9e61cce6baff9447304aa917d Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 21 Dec 2021 09:45:54 +0100 Subject: [PATCH] Fix tests for newer Django and Python --- .../project/settings.py | 34 +++++++++++++------ .../project/urls.py | 2 +- .../requirements.txt | 3 +- test/django-test-app/project/settings.py | 34 +++++++++++++------ test/django-test-app/project/urls.py | 2 +- test/django-test-app/requirements.txt | 3 +- 6 files changed, 54 insertions(+), 24 deletions(-) diff --git a/test/django-different-port-test-app/project/settings.py b/test/django-different-port-test-app/project/settings.py index 5827794..79072d0 100644 --- a/test/django-different-port-test-app/project/settings.py +++ b/test/django-different-port-test-app/project/settings.py @@ -10,6 +10,7 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/1.8/ref/settings/ """ +import django # Build paths inside the project like this: os.path.join(BASE_DIR, ...) import os @@ -40,16 +41,29 @@ INSTALLED_APPS = ( 'django.contrib.staticfiles', ) -MIDDLEWARE_CLASSES = ( - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'django.middleware.security.SecurityMiddleware', -) +# Django 1 +if django.VERSION[0] == 1: + MIDDLEWARE_CLASSES = ( + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'django.middleware.security.SecurityMiddleware', + ) +else: + # Django 2+ + MIDDLEWARE = ( + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'django.middleware.security.SecurityMiddleware', + ) ROOT_URLCONF = 'project.urls' diff --git a/test/django-different-port-test-app/project/urls.py b/test/django-different-port-test-app/project/urls.py index b5e472c..dde7636 100644 --- a/test/django-different-port-test-app/project/urls.py +++ b/test/django-different-port-test-app/project/urls.py @@ -17,5 +17,5 @@ from django.conf.urls import include, url from django.contrib import admin urlpatterns = [ - url(r'^admin/', include(admin.site.urls)), + url(r'^admin/', admin.site.urls), ] diff --git a/test/django-different-port-test-app/requirements.txt b/test/django-different-port-test-app/requirements.txt index 30eb621..901c5f8 100644 --- a/test/django-different-port-test-app/requirements.txt +++ b/test/django-different-port-test-app/requirements.txt @@ -1 +1,2 @@ -Django==1.11.29 +Django<3; python_version > '3.8' +Django<2; python_version <='3.8' diff --git a/test/django-test-app/project/settings.py b/test/django-test-app/project/settings.py index 5827794..79072d0 100644 --- a/test/django-test-app/project/settings.py +++ b/test/django-test-app/project/settings.py @@ -10,6 +10,7 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/1.8/ref/settings/ """ +import django # Build paths inside the project like this: os.path.join(BASE_DIR, ...) import os @@ -40,16 +41,29 @@ INSTALLED_APPS = ( 'django.contrib.staticfiles', ) -MIDDLEWARE_CLASSES = ( - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'django.middleware.security.SecurityMiddleware', -) +# Django 1 +if django.VERSION[0] == 1: + MIDDLEWARE_CLASSES = ( + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'django.middleware.security.SecurityMiddleware', + ) +else: + # Django 2+ + MIDDLEWARE = ( + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'django.middleware.security.SecurityMiddleware', + ) ROOT_URLCONF = 'project.urls' diff --git a/test/django-test-app/project/urls.py b/test/django-test-app/project/urls.py index b5e472c..dde7636 100644 --- a/test/django-test-app/project/urls.py +++ b/test/django-test-app/project/urls.py @@ -17,5 +17,5 @@ from django.conf.urls import include, url from django.contrib import admin urlpatterns = [ - url(r'^admin/', include(admin.site.urls)), + url(r'^admin/', admin.site.urls), ] diff --git a/test/django-test-app/requirements.txt b/test/django-test-app/requirements.txt index 30eb621..901c5f8 100644 --- a/test/django-test-app/requirements.txt +++ b/test/django-test-app/requirements.txt @@ -1 +1,2 @@ -Django==1.11.29 +Django<3; python_version > '3.8' +Django<2; python_version <='3.8'