From 36f3d8d6ef5205769415ab5ab5273ef34f8be231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Bastian?= Date: Sun, 15 Dec 2019 23:10:08 +0100 Subject: [PATCH 1/2] Bump Django version to 2.2 --- WikiENS/settings.py | 131 +++++++++++++++++++++----------------------- requirement.txt | 6 +- 2 files changed, 64 insertions(+), 73 deletions(-) diff --git a/WikiENS/settings.py b/WikiENS/settings.py index f7ac2a8..21512f7 100644 --- a/WikiENS/settings.py +++ b/WikiENS/settings.py @@ -12,7 +12,7 @@ https://docs.djangoproject.com/en/1.11/ref/settings/ import os -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -22,7 +22,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = '_u5q4-^1qgkqg=i5o5ha*xkd@82#l$e+%m)$v+4y#t-5!g-%g2' +SECRET_KEY = "_u5q4-^1qgkqg=i5o5ha*xkd@82#l$e+%m)$v+4y#t-5!g-%g2" # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True @@ -33,66 +33,63 @@ ALLOWED_HOSTS = [] # Application definition INSTALLED_APPS = [ - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'django.contrib.sites', - 'django.contrib.humanize', - - 'django_nyt', - 'mptt', - 'sekizai', - 'sorl.thumbnail', - 'widget_tweaks', - - 'shared', # Do not move, so templates in `shared` can override - # thoses in `wiki` - 'wiki', - 'wiki.plugins.attachments', - 'wiki.plugins.notifications', - 'wiki.plugins.images', - 'wiki.plugins.macros', - - 'allauth_ens', - 'allauth', - 'allauth.account', - 'allauth.socialaccount', - 'allauth_ens.providers.clipper', + "django.contrib.admin", + "django.contrib.auth", + "django.contrib.contenttypes", + "django.contrib.sessions", + "django.contrib.messages", + "django.contrib.staticfiles", + "django.contrib.sites", + "django.contrib.humanize", + "django_nyt", + "mptt", + "sekizai", + "sorl.thumbnail", + "widget_tweaks", + "shared", # Do not move, so templates in `shared` can override + # thoses in `wiki` + "wiki", + "wiki.plugins.attachments", + "wiki.plugins.notifications", + "wiki.plugins.images", + "wiki.plugins.macros", + "allauth_ens", + "allauth", + "allauth.account", + "allauth.socialaccount", + "allauth_ens.providers.clipper", ] MIDDLEWARE = [ - 'django.middleware.security.SecurityMiddleware', - '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", + "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", ] -ROOT_URLCONF = 'WikiENS.urls' +ROOT_URLCONF = "WikiENS.urls" TEMPLATES = [ { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - 'django.contrib.messages.context_processors.messages', + "BACKEND": "django.template.backends.django.DjangoTemplates", + "DIRS": [], + "APP_DIRS": True, + "OPTIONS": { + "context_processors": [ + "django.template.context_processors.debug", + "django.template.context_processors.request", + "django.contrib.auth.context_processors.auth", + "django.contrib.messages.context_processors.messages", "sekizai.context_processors.sekizai", ], }, }, ] -WSGI_APPLICATION = 'WikiENS.wsgi.application' +WSGI_APPLICATION = "WikiENS.wsgi.application" SITE_ID = 1 @@ -101,9 +98,9 @@ SITE_ID = 1 # https://docs.djangoproject.com/en/1.11/ref/settings/#databases DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + "default": { + "ENGINE": "django.db.backends.sqlite3", + "NAME": os.path.join(BASE_DIR, "db.sqlite3"), } } @@ -113,26 +110,20 @@ DATABASES = { AUTH_PASSWORD_VALIDATORS = [ { - 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator", }, + {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",}, + {"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",}, + {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",}, ] # Internationalization # https://docs.djangoproject.com/en/1.11/topics/i18n/ -LANGUAGE_CODE = 'fr-fr' +LANGUAGE_CODE = "fr-fr" -TIME_ZONE = 'Europe/Paris' +TIME_ZONE = "Europe/Paris" USE_I18N = True @@ -144,13 +135,13 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/1.11/howto/static-files/ -STATIC_URL = '/static/' +STATIC_URL = "/static/" # Email # https://docs.djangoproject.com/en/1.11/topics/email/ -EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' +EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend" # Authentication @@ -158,15 +149,15 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' # https://django-allauth.readthedocs.io/en/latest/index.html AUTHENTICATION_BACKENDS = [ - 'allauth.account.auth_backends.AuthenticationBackend', + "allauth.account.auth_backends.AuthenticationBackend", ] -ACCOUNT_ADAPTER = 'shared.allauth_adapter.AccountAdapter' -SOCIALACCOUNT_ADAPTER = 'shared.allauth_adapter.SocialAccountAdapter' +ACCOUNT_ADAPTER = "shared.allauth_adapter.AccountAdapter" +SOCIALACCOUNT_ADAPTER = "shared.allauth_adapter.SocialAccountAdapter" -HOME_URL = reverse_lazy('wiki:root') +HOME_URL = reverse_lazy("wiki:root") -LOGIN_URL = '/_profil/login/' +LOGIN_URL = "/_profil/login/" LOGIN_REDIRECT_URL = HOME_URL ACCOUNT_LOGOUT_REDIRECT_URL = HOME_URL diff --git a/requirement.txt b/requirement.txt index ecfb1af..1b7f7be 100644 --- a/requirement.txt +++ b/requirement.txt @@ -1,4 +1,4 @@ -Django==1.11.* +Django==2.2.* # django-allauth-ens==1.0.0b2 -git+https://git.eleves.ens.fr/cof-geek/django-allauth-ens.git@Qwann/small_fixes -wiki==0.3.1 +git+https://git.eleves.ens.fr/klub-dev-ens/django-allauth-ens.git +wiki==0.5 From b9f1c2ecffd8fc866350ca9d1fd510527a378fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Bastian?= Date: Sun, 15 Dec 2019 23:10:44 +0100 Subject: [PATCH 2/2] Move settings.py -> settings.default.py This allows us to have a production settings.py that doesn't get overwritten at every git pull --- WikiENS/.gitignore | 1 + WikiENS/{settings.py => settings.default.py} | 0 2 files changed, 1 insertion(+) create mode 100644 WikiENS/.gitignore rename WikiENS/{settings.py => settings.default.py} (100%) diff --git a/WikiENS/.gitignore b/WikiENS/.gitignore new file mode 100644 index 0000000..fce19e4 --- /dev/null +++ b/WikiENS/.gitignore @@ -0,0 +1 @@ +settings.py diff --git a/WikiENS/settings.py b/WikiENS/settings.default.py similarity index 100% rename from WikiENS/settings.py rename to WikiENS/settings.default.py