Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support Django 2.1

Browse source
This commit is contained in:
Griatch 2019-03-25 23:36:38 +01:00
parent fbfb6da975
commit a1f7fd3081
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/server/evennia_launcher.py
View file

@ -91,8 +91,8 @@ SRESET = chr(19) # shutdown server in reset mode
# requirements # requirements
PYTHON_MIN = '3.7' PYTHON_MIN = '3.7'
TWISTED_MIN = '18.0.0' TWISTED_MIN = '18.0.0'
DJANGO_MIN = '1.11' DJANGO_MIN = '2.1'
DJANGO_REC = '2.0' DJANGO_REC = '2.1'
try: try:
sys.path[1] = EVENNIA_ROOT sys.path[1] = EVENNIA_ROOT

3
evennia/web/utils/backends.py
View file

@ -10,11 +10,12 @@ class CaseInsensitiveModelBackend(ModelBackend):
""" """
def authenticate(self, username=None, password=None, autologin=None): def authenticate(self, request, username=None, password=None, autologin=None):
""" """
Custom authenticate with bypass for auto-logins Custom authenticate with bypass for auto-logins
Args: Args:
request (Request): Request object.
username (str, optional): Name of user to authenticate. username (str, optional): Name of user to authenticate.
password (str, optional): Password of user password (str, optional): Password of user
autologin (Account, optional): If given, assume this is autologin (Account, optional): If given, assume this is

2
requirements.txt
View file

@ -1,7 +1,7 @@
# Evennia dependencies, for Linux/Mac platforms # Evennia dependencies, for Linux/Mac platforms
# general # general
django >= 2.0, < 2.1 django >= 2.1, < 2.2
twisted >= 18.0.0, < 19.0.0 twisted >= 18.0.0, < 19.0.0
pillow == 5.2.0 pillow == 5.2.0
pytz pytz

2
win_requirements.txt
View file

@ -4,7 +4,7 @@
pypiwin32 pypiwin32
# general # general
django > 1.11, < 2.0 django >= 2.1, < 2.2
twisted >= 18.0.0, < 19.0.0 twisted >= 18.0.0, < 19.0.0
pillow == 5.2.0 pillow == 5.2.0
pytz pytz