Skip to content

Commit

Permalink
Merge pull request #194 from innogames/django_3.2.x
Browse files Browse the repository at this point in the history
Upgrade to Django 3.2.x
  • Loading branch information
kofrezo committed Nov 23, 2021
2 parents 8109f75 + 9440591 commit 57ab015
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ netaddr = "*"
# WSGI server
gunicorn = "*"
# Debian stretch version
Django = "~=2.2"
Django = "~=3.2"
# postgres lib used by django
psycopg2-binary = "<2.9"
# Django support for network address fields on PostgreSQL
Expand Down
68 changes: 42 additions & 26 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions serveradmin/api/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
default_app_config = 'serveradmin.api.apps.ApiConfig'

"""Serveradmin - Remote HTTP API
Copyright (c) 2019 InnoGames GmbH
Expand Down
8 changes: 7 additions & 1 deletion serveradmin/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,17 @@

ALLOWED_HOSTS = env('ALLOWED_HOSTS', default=[])

# Default model used for the implicit generate primary key when no attribute
# of a model as primary_key = True.
#
# See https://docs.djangoproject.com/en/3.2/releases/3.2/#customizing-type-of-auto-created-primary-keys
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'

# Try to connect to a local postgres DB called serveradmin via user based
# authentication by default.
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'ENGINE': 'django.db.backends.postgresql',
'NAME': env('POSTGRES_DB', default=None),
'USER': env('POSTGRES_USER', default=None),
'PASSWORD': env('POSTGRES_PASSWORD', default=None),
Expand Down

0 comments on commit 57ab015

Please sign in to comment.