diff --git a/.gitmodules b/.gitmodules index 1664ebd..25afaf1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "media"] path = media url = https://git.mount-mockery.de/pylib/media.git +[submodule "stringtools"] + path = stringtools + url = https://git.mount-mockery.de/pylib/stringtools diff --git a/main/asgi.py b/main/asgi.py new file mode 100644 index 0000000..fabf75e --- /dev/null +++ b/main/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for main project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/3.0/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'main.settings') + +application = get_asgi_application() diff --git a/main/settings.py b/main/settings.py index ea374fc..383ae5c 100644 --- a/main/settings.py +++ b/main/settings.py @@ -1,13 +1,13 @@ """ Django settings for this project. -Generated by 'django-admin startproject' using Django 2.2.3. +Generated by 'django-admin startproject' using Django 3.0.3. For more information on this file, see -https://docs.djangoproject.com/en/2.2/topics/settings/ +https://docs.djangoproject.com/en/3.0/topics/settings/ For the full list of settings and their values, see -https://docs.djangoproject.com/en/2.2/ref/settings/ +https://docs.djangoproject.com/en/3.0/ref/settings/ """ import config @@ -56,7 +56,7 @@ for property_name in USER_CONFIG_DEFAULTS: setattr(thismodule, property_name, value) # Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/ +# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! # @@ -68,7 +68,7 @@ if SECRET_KEY is None: # SECURITY WARNING: don't run with debug turned on in production! # -DEBUG = False +DEBUG = True # Application definition @@ -120,7 +120,7 @@ WSGI_APPLICATION = 'main.wsgi.application' # Database -# https://docs.djangoproject.com/en/2.2/ref/settings/#databases +# https://docs.djangoproject.com/en/3.0/ref/settings/#databases # DATABASES = { 'default': { @@ -131,7 +131,7 @@ DATABASES = { # Password validation -# https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators +# https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators # AUTH_PASSWORD_VALIDATORS = [ { @@ -155,7 +155,7 @@ WHOOSH_PATH = os.path.join(BASE_DIR, 'data', 'whoosh_index') # Internationalization -# https://docs.djangoproject.com/en/2.2/topics/i18n/ +# https://docs.djangoproject.com/en/3.0/topics/i18n/ # LANGUAGE_CODE = 'en-us' LANGUAGES = [ @@ -178,7 +178,7 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/2.2/howto/static-files/ +# https://docs.djangoproject.com/en/3.0/howto/static-files/ # STATIC_ROOT = os.path.join(BASE_DIR, 'data', 'static') STATIC_URL = '/static/' diff --git a/main/urls.py b/main/urls.py index 520b18c..d2f3468 100644 --- a/main/urls.py +++ b/main/urls.py @@ -1,7 +1,7 @@ """Project URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/2.2/topics/http/urls/ + https://docs.djangoproject.com/en/3.0/topics/http/urls/ Examples: Function views 1. Add an import: from my_app import views diff --git a/main/wsgi.py b/main/wsgi.py index fa40526..9a58840 100644 --- a/main/wsgi.py +++ b/main/wsgi.py @@ -4,7 +4,7 @@ WSGI config for this project. It exposes the WSGI callable as a module-level variable named ``application``. For more information on this file, see -https://docs.djangoproject.com/en/2.2/howto/deployment/wsgi/ +https://docs.djangoproject.com/en/3.0/howto/deployment/wsgi/ """ import os diff --git a/requirements.txt b/requirements.txt index 1969324..4c515d8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django>=2.0.5,<3.0 +Django>=2.0.5 Pillow>=5.4.1 python-creole>=1.0.0 Whoosh>=2.4.0 diff --git a/stringtools b/stringtools new file mode 160000 index 0000000..a12e00b --- /dev/null +++ b/stringtools @@ -0,0 +1 @@ +Subproject commit a12e00bb8152af3863370d1c9b3fcadc8ddae31a diff --git a/themes b/themes index a24e772..b0106a3 160000 --- a/themes +++ b/themes @@ -1 +1 @@ -Subproject commit a24e772083b27e9ab413d137005dbc9e8325dbc4 +Subproject commit b0106a3d5cc302844dacc681f75f047876525e5e