浏览代码

django3 compatibility and links in comments

master
Dirk Alders 4 年前
父节点
当前提交
56fff08ebb
共有 8 个文件被更改,包括 33 次插入13 次删除
  1. 3
    0
      .gitmodules
  2. 16
    0
      main/asgi.py
  3. 9
    9
      main/settings.py
  4. 1
    1
      main/urls.py
  5. 1
    1
      main/wsgi.py
  6. 1
    1
      requirements.txt
  7. 1
    0
      stringtools
  8. 1
    1
      themes

+ 3
- 0
.gitmodules 查看文件

19
 [submodule "media"]
19
 [submodule "media"]
20
 	path = media
20
 	path = media
21
 	url = https://git.mount-mockery.de/pylib/media.git
21
 	url = https://git.mount-mockery.de/pylib/media.git
22
+[submodule "stringtools"]
23
+	path = stringtools
24
+	url = https://git.mount-mockery.de/pylib/stringtools

+ 16
- 0
main/asgi.py 查看文件

1
+"""
2
+ASGI config for main project.
3
+
4
+It exposes the ASGI callable as a module-level variable named ``application``.
5
+
6
+For more information on this file, see
7
+https://docs.djangoproject.com/en/3.0/howto/deployment/asgi/
8
+"""
9
+
10
+import os
11
+
12
+from django.core.asgi import get_asgi_application
13
+
14
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'main.settings')
15
+
16
+application = get_asgi_application()

+ 9
- 9
main/settings.py 查看文件

1
 """
1
 """
2
 Django settings for this project.
2
 Django settings for this project.
3
 
3
 
4
-Generated by 'django-admin startproject' using Django 2.2.3.
4
+Generated by 'django-admin startproject' using Django 3.0.3.
5
 
5
 
6
 For more information on this file, see
6
 For more information on this file, see
7
-https://docs.djangoproject.com/en/2.2/topics/settings/
7
+https://docs.djangoproject.com/en/3.0/topics/settings/
8
 
8
 
9
 For the full list of settings and their values, see
9
 For the full list of settings and their values, see
10
-https://docs.djangoproject.com/en/2.2/ref/settings/
10
+https://docs.djangoproject.com/en/3.0/ref/settings/
11
 """
11
 """
12
 
12
 
13
 import config
13
 import config
56
     setattr(thismodule, property_name, value)
56
     setattr(thismodule, property_name, value)
57
 
57
 
58
 # Quick-start development settings - unsuitable for production
58
 # Quick-start development settings - unsuitable for production
59
-# See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/
59
+# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
60
 
60
 
61
 # SECURITY WARNING: keep the secret key used in production secret!
61
 # SECURITY WARNING: keep the secret key used in production secret!
62
 #
62
 #
68
 
68
 
69
 # SECURITY WARNING: don't run with debug turned on in production!
69
 # SECURITY WARNING: don't run with debug turned on in production!
70
 #
70
 #
71
-DEBUG = False
71
+DEBUG = True
72
 
72
 
73
 
73
 
74
 # Application definition
74
 # Application definition
120
 
120
 
121
 
121
 
122
 # Database
122
 # Database
123
-# https://docs.djangoproject.com/en/2.2/ref/settings/#databases
123
+# https://docs.djangoproject.com/en/3.0/ref/settings/#databases
124
 #
124
 #
125
 DATABASES = {
125
 DATABASES = {
126
     'default': {
126
     'default': {
131
 
131
 
132
 
132
 
133
 # Password validation
133
 # Password validation
134
-# https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators
134
+# https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators
135
 #
135
 #
136
 AUTH_PASSWORD_VALIDATORS = [
136
 AUTH_PASSWORD_VALIDATORS = [
137
     {
137
     {
155
 
155
 
156
 
156
 
157
 # Internationalization
157
 # Internationalization
158
-# https://docs.djangoproject.com/en/2.2/topics/i18n/
158
+# https://docs.djangoproject.com/en/3.0/topics/i18n/
159
 #
159
 #
160
 LANGUAGE_CODE = 'en-us'
160
 LANGUAGE_CODE = 'en-us'
161
 LANGUAGES = [
161
 LANGUAGES = [
178
 
178
 
179
 
179
 
180
 # Static files (CSS, JavaScript, Images)
180
 # Static files (CSS, JavaScript, Images)
181
-# https://docs.djangoproject.com/en/2.2/howto/static-files/
181
+# https://docs.djangoproject.com/en/3.0/howto/static-files/
182
 #
182
 #
183
 STATIC_ROOT = os.path.join(BASE_DIR, 'data', 'static')
183
 STATIC_ROOT = os.path.join(BASE_DIR, 'data', 'static')
184
 STATIC_URL = '/static/'
184
 STATIC_URL = '/static/'

+ 1
- 1
main/urls.py 查看文件

1
 """Project URL Configuration
1
 """Project URL Configuration
2
 
2
 
3
 The `urlpatterns` list routes URLs to views. For more information please see:
3
 The `urlpatterns` list routes URLs to views. For more information please see:
4
-    https://docs.djangoproject.com/en/2.2/topics/http/urls/
4
+    https://docs.djangoproject.com/en/3.0/topics/http/urls/
5
 Examples:
5
 Examples:
6
 Function views
6
 Function views
7
     1. Add an import:  from my_app import views
7
     1. Add an import:  from my_app import views

+ 1
- 1
main/wsgi.py 查看文件

4
 It exposes the WSGI callable as a module-level variable named ``application``.
4
 It exposes the WSGI callable as a module-level variable named ``application``.
5
 
5
 
6
 For more information on this file, see
6
 For more information on this file, see
7
-https://docs.djangoproject.com/en/2.2/howto/deployment/wsgi/
7
+https://docs.djangoproject.com/en/3.0/howto/deployment/wsgi/
8
 """
8
 """
9
 
9
 
10
 import os
10
 import os

+ 1
- 1
requirements.txt 查看文件

1
-Django>=2.0.5,<3.0
1
+Django>=2.0.5
2
 Pillow>=5.4.1
2
 Pillow>=5.4.1
3
 python-creole>=1.0.0
3
 python-creole>=1.0.0
4
 Whoosh>=2.4.0
4
 Whoosh>=2.4.0

+ 1
- 0
stringtools

1
+Subproject commit a12e00bb8152af3863370d1c9b3fcadc8ddae31a

+ 1
- 1
themes

1
-Subproject commit a24e772083b27e9ab413d137005dbc9e8325dbc4
1
+Subproject commit b0106a3d5cc302844dacc681f75f047876525e5e

正在加载...
取消
保存