Update django, wagtail and some others
This commit is contained in:
parent
ab3029bd75
commit
cf66702d75
12
Pipfile
12
Pipfile
|
|
@ -15,8 +15,8 @@ django-silk = "*"
|
||||||
[packages]
|
[packages]
|
||||||
factory-boy = "==2.11.0"
|
factory-boy = "==2.11.0"
|
||||||
wagtail_factories = "==2.0.0"
|
wagtail_factories = "==2.0.0"
|
||||||
django = "<3"
|
django = "==3.2"
|
||||||
whitenoise = "==4.0b4"
|
whitenoise = "~=5.3"
|
||||||
psycopg2 = "==2.8.6"
|
psycopg2 = "==2.8.6"
|
||||||
gunicorn = "==19.7.1"
|
gunicorn = "==19.7.1"
|
||||||
python-dotenv = "==0.13.0"
|
python-dotenv = "==0.13.0"
|
||||||
|
|
@ -24,11 +24,11 @@ dj-database-url = "==0.4.1"
|
||||||
raven = "==6.9.0"
|
raven = "==6.9.0"
|
||||||
django-extensions = "==1.9.8"
|
django-extensions = "==1.9.8"
|
||||||
graphene-django = "==2.15.0"
|
graphene-django = "==2.15.0"
|
||||||
django-filter = "==2.0.0"
|
django-filter = "~=21.1"
|
||||||
djangorestframework = "==3.8.2"
|
djangorestframework = "~=3.8"
|
||||||
pillow = "==5.0.0"
|
pillow = "==5.0.0"
|
||||||
wagtail = "==2.5"
|
wagtail = "~=2.15"
|
||||||
django-cors-headers = "==2.2.0"
|
django-cors-headers = "~=3.0"
|
||||||
django-storages = "*"
|
django-storages = "*"
|
||||||
boto3 = "*"
|
boto3 = "*"
|
||||||
django-compressor = "*"
|
django-compressor = "*"
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,14 +1,3 @@
|
||||||
"""
|
|
||||||
Django settings for cariot_backend project.
|
|
||||||
|
|
||||||
Generated by 'django-admin startproject' using Django 1.11.7.
|
|
||||||
|
|
||||||
For more information on this file, see
|
|
||||||
https://docs.djangoproject.com/en/1.11/topics/settings/
|
|
||||||
|
|
||||||
For the full list of settings and their values, see
|
|
||||||
https://docs.djangoproject.com/en/1.11/ref/settings/
|
|
||||||
"""
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
|
@ -109,7 +98,7 @@ if DEBUG:
|
||||||
INSTALLED_APPS += ['corsheaders']
|
INSTALLED_APPS += ['corsheaders']
|
||||||
MIDDLEWARE += ['corsheaders.middleware.CorsMiddleware']
|
MIDDLEWARE += ['corsheaders.middleware.CorsMiddleware']
|
||||||
CORS_ORIGIN_WHITELIST = (
|
CORS_ORIGIN_WHITELIST = (
|
||||||
'localhost:8080',
|
'http://localhost:8080',
|
||||||
)
|
)
|
||||||
CORS_ALLOW_CREDENTIALS = True
|
CORS_ALLOW_CREDENTIALS = True
|
||||||
|
|
||||||
|
|
@ -125,7 +114,6 @@ MIDDLEWARE += [
|
||||||
'django.contrib.messages.middleware.MessageMiddleware',
|
'django.contrib.messages.middleware.MessageMiddleware',
|
||||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||||
|
|
||||||
'wagtail.core.middleware.SiteMiddleware',
|
|
||||||
'wagtail.contrib.redirects.middleware.RedirectMiddleware',
|
'wagtail.contrib.redirects.middleware.RedirectMiddleware',
|
||||||
|
|
||||||
'core.middleware.ThreadLocalMiddleware',
|
'core.middleware.ThreadLocalMiddleware',
|
||||||
|
|
@ -438,3 +426,9 @@ ENABLE_SPELLCHECK = True if TASKBASE_BASEURL else False
|
||||||
TEST_RUNNER = 'xmlrunner.extra.djangotestrunner.XMLTestRunner'
|
TEST_RUNNER = 'xmlrunner.extra.djangotestrunner.XMLTestRunner'
|
||||||
TEST_OUTPUT_DIR = './test-reports/'
|
TEST_OUTPUT_DIR = './test-reports/'
|
||||||
TEST_OUTPUT_VERBOSE = 1
|
TEST_OUTPUT_VERBOSE = 1
|
||||||
|
|
||||||
|
# new default in Django 3.0, making it explicit to facilitate bug hunting
|
||||||
|
X_FRAME_OPTIONS = 'DENY'
|
||||||
|
SECURE_CONTENT_TYPE_NOSNIFF = True
|
||||||
|
# Django 3.2 uses BitAutoField by default, we keep things the old way
|
||||||
|
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ import json
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.contrib.postgres.fields import JSONField
|
from django.db.models import JSONField
|
||||||
from django.forms import widgets
|
from django.forms import widgets
|
||||||
from django.utils.html import format_html
|
from django.utils.html import format_html
|
||||||
from graphql_relay import to_global_id
|
from graphql_relay import to_global_id
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
# Generated by Django 3.2 on 2021-12-13 14:46
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('surveys', '0004_survey_module'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='answer',
|
||||||
|
name='data',
|
||||||
|
field=models.JSONField(),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='survey',
|
||||||
|
name='data',
|
||||||
|
field=models.JSONField(),
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
from django.contrib.auth import get_user_model
|
from django.contrib.auth import get_user_model
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.contrib.postgres.fields import JSONField
|
from django.db.models import JSONField
|
||||||
from wagtail.snippets.models import register_snippet
|
from wagtail.snippets.models import register_snippet
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
# Generated by Django 3.2 on 2021-12-13 14:46
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('users', '0029_auto_20210922_0550'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='user',
|
||||||
|
name='first_name',
|
||||||
|
field=models.CharField(blank=True, max_length=150, verbose_name='first name'),
|
||||||
|
),
|
||||||
|
]
|
||||||
Loading…
Reference in New Issue