From 413629869567155dc04d772a2bfb229e0457fddf Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 5 Oct 2021 23:22:50 +0200 Subject: [PATCH] Up min Django version to 3.2. Update recommended. --- docs/source/Getting-Started.md | 6 +++--- evennia/server/evennia_launcher.py | 4 ++-- evennia/settings_default.py | 3 ++- requirements.txt | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docs/source/Getting-Started.md b/docs/source/Getting-Started.md index d2b6d2c25c..42b2c363a3 100644 --- a/docs/source/Getting-Started.md +++ b/docs/source/Getting-Started.md @@ -48,7 +48,7 @@ everything in the following sections. - Windows (Vista, Win7, Win8, Win10) - Mac OSX (>=10.5 recommended) -- [Python](http://www.python.org) (v3.7, 3.8 are tested) +- [Python](http://www.python.org) (v3.7, 3.8 or 3.9) - [virtualenv](http://pypi.python.org/pypi/virtualenv) for making isolated Python environments. Installed with `pip install virtualenv`. @@ -56,13 +56,13 @@ everything in the following sections. updating Evennia itself - Mac users can use the [git-osx-installer](http://code.google.com/p/git-osx-installer/) or the [MacPorts version](http://git-scm.com/book/en/Getting-Started-Installing-Git#Installing-on-Mac). -- [Twisted](http://twistedmatrix.com) (v19.0+) +- [Twisted](http://twistedmatrix.com) (v21.0+) - [ZopeInterface](http://www.zope.org/Products/ZopeInterface) (v3.0+) - usually included in Twisted packages - Linux/Mac users may need the `gcc` and `python-dev` packages or equivalent. - Windows users need [MS Visual C++](https://aka.ms/vs/16/release/vs_buildtools.exe) and *maybe* [pypiwin32](https://pypi.python.org/pypi/pypiwin32). -- [Django](http://www.djangoproject.com) (v2.2.x), be warned that latest dev +- [Django](http://www.djangoproject.com) (v3.2.x), be warned that latest dev version is usually untested with Evennia) ## Linux Install diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py index 9fed573caf..6b0747bc6b 100644 --- a/evennia/server/evennia_launcher.py +++ b/evennia/server/evennia_launcher.py @@ -93,8 +93,8 @@ SRESET = chr(19) # shutdown server in reset mode # requirements PYTHON_MIN = "3.7" TWISTED_MIN = "18.0.0" -DJANGO_MIN = "2.2.5" -DJANGO_LT = "3.0" +DJANGO_MIN = "3.2" +DJANGO_LT = "3.3" try: sys.path[1] = EVENNIA_ROOT diff --git a/evennia/settings_default.py b/evennia/settings_default.py index 8dd6f41374..15c7807977 100644 --- a/evennia/settings_default.py +++ b/evennia/settings_default.py @@ -278,7 +278,8 @@ ATTRIBUTE_STORED_MODEL_RENAME = [ (("players", "playerdb"), ("accounts", "accountdb")), (("typeclasses", "defaultplayer"), ("typeclasses", "defaultaccount")), ] - +# Default type of autofield (required by Django) +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' ###################################################################### # Evennia pluggable modules diff --git a/requirements.txt b/requirements.txt index 00f90ccfc7..4d80639eef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ # Evennia dependencies # general -django >= 2.2.5, < 3.0 +django >= 3.2, < 3.3 twisted >= 21.7.0, < 22.0.0 pytz django-sekizai