diff --git a/Dockerfile b/Dockerfile index 2c84082..3d27d0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,9 @@ WORKDIR /code RUN apt update && \ apt install -y gettext nginx uwsgi uwsgi-plugin-python3 && \ + apt install -y python3-django python3-django-crispy-forms \ + python3-django-extensions python3-django-tables2 python3-docutils \ + python3-psycopg2 && \ rm -rf /var/lib/apt/lists/* COPY requirements.txt /code/ diff --git a/requirements.txt b/requirements.txt index 21c2480..36faca7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,27 +1,8 @@ -certifi==2019.6.16 -chardet==3.0.4 -defusedxml==0.6.0 -Django~=2.2 -django-allauth==0.39.1 +Django>=3.2,<4.0 django-autocomplete-light==3.5.1 django-crispy-forms==1.7.2 django-extensions==2.1.9 -django-filter==2.2.0 -django-guardian==2.1.0 -django-polymorphic==2.0.3 djangorestframework==3.9.0 -django-rest-polymorphic==0.1.8 -django-reversion==3.0.3 django-tables2==2.1.0 docutils==0.14 psycopg2==2.8.4 -idna==2.8 -oauthlib==3.1.0 -Pillow==6.1.0 -python3-openid==3.1.0 -pytz==2019.1 -requests==2.22.0 -requests-oauthlib==1.2.0 -six==1.12.0 -sqlparse==0.3.0 -urllib3==1.25.3 diff --git a/tombola/settings/base.py b/tombola/settings/base.py index 530a765..6817057 100644 --- a/tombola/settings/base.py +++ b/tombola/settings/base.py @@ -32,14 +32,6 @@ ALLOWED_HOSTS = [] # Application definition INSTALLED_APPS = [ - # Theme overrides Django Admin templates - # 'theme', - - # External apps - 'polymorphic', - 'reversion', - 'crispy_forms', - 'django_tables2', # Django contrib 'django.contrib.admin', 'django.contrib.admindocs', @@ -55,6 +47,10 @@ INSTALLED_APPS = [ # Autocomplete 'dal', 'dal_select2', + # External apps + 'crispy_forms', + 'django_tables2', + 'django_extensions', # Tombola apps 'tbde',