BIG UPD: migrate to python 3.10 and django 3.2
All checks were successful
buildbot/tox Build done.

This commit is contained in:
2022-06-07 16:07:08 +02:00
parent edd4050935
commit 8610e2a557
36 changed files with 192 additions and 91 deletions

View File

@@ -3,8 +3,8 @@
# Additional settings for django-dav
#
BASE_VAR_DIR = os.path.join(BASE_DIR, 'var')
BASE_SHARE_DIR = os.path.join(BASE_DIR, 'common')
BASE_VAR_DIR = BASE_DIR / 'var'
BASE_SHARE_DIR = BASE_DIR / 'common'
# Get modules config
from dav_base.config.modules import ModuleConfig
@@ -14,7 +14,7 @@ INSTALLED_APPS += [
'bootstrap3',
'datetimewidget',
'django_countries',
'django_extensions',
# 'django_extensions',
# Our main app
'dav_base',
]
@@ -45,11 +45,11 @@ TEMPLATES += [
# Add our local templates directory to the template engine configurations.
for config in TEMPLATES:
config['DIRS'].append(os.path.join(BASE_SHARE_DIR, 'templates'))
config['DIRS'].append(BASE_SHARE_DIR / 'templates')
DATABASES['default'] = {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_VAR_DIR, 'db', 'devel.sqlite3'),
'NAME': BASE_VAR_DIR / 'db' / 'devel.sqlite3',
}
AUTH_PASSWORD_VALIDATORS = [
@@ -76,7 +76,7 @@ AUTH_PASSWORD_VALIDATORS = [
},
]
STATIC_ROOT = os.path.join(BASE_VAR_DIR, 'www', 'static')
STATIC_ROOT = BASE_VAR_DIR / 'www' / 'static'
LANGUAGE_CODE = 'de'
TIME_ZONE = 'Europe/Berlin'
@@ -130,20 +130,20 @@ LOGGING = {
'default_log': {
'level': 'INFO',
'class': 'logging.FileHandler',
'filename': os.path.join(BASE_VAR_DIR, 'log', 'default.log'),
'filename': BASE_VAR_DIR / 'log' / 'default.log',
'formatter': 'default',
},
'error_log': {
'level': 'ERROR',
'class': 'logging.FileHandler',
'filename': os.path.join(BASE_VAR_DIR, 'log', 'error.log'),
'filename': BASE_VAR_DIR / 'log' / 'error.log',
'formatter': 'default',
},
'debug_log': {
'level': 'DEBUG',
'filters': ['require_debug_true'],
'class': 'logging.FileHandler',
'filename': os.path.join(BASE_VAR_DIR, 'log', 'debug.log'),
'filename': BASE_VAR_DIR / 'log' / 'debug.log',
'formatter': 'verbose',
},
},