diff --git a/CHANGELOG.md b/CHANGELOG.md index 91b1d5b3da..6dda27e14c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -80,6 +80,7 @@ ### General +- Up requirements to Django 1.11.x, Twited 18 and pillow 5.2.0 - Start structuring the `CHANGELOG` to list features in more detail. - Docker image `evennia/evennia:develop` is now auto-built, tracking the develop branch. - Inflection and grouping of multiple objects in default room (an box, three boxes) diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py index 4ae2699e60..6b41f16d4a 100644 --- a/evennia/server/evennia_launcher.py +++ b/evennia/server/evennia_launcher.py @@ -94,7 +94,7 @@ SRESET = chr(19) # shutdown server in reset mode # requirements PYTHON_MIN = '2.7' -TWISTED_MIN = '16.0.0' +TWISTED_MIN = '18.0.0' DJANGO_MIN = '1.11' DJANGO_REC = '1.11' diff --git a/requirements.txt b/requirements.txt index 347b838fe6..cf51c7c98d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ # Evennia dependencies, for Linux/Mac platforms # general -django > 1.10, < 2.0 -twisted == 16.0.0 -pillow == 2.9.0 +django > 1.11, < 2.0 +twisted >= 18.0.0, < 19.0.0 +pillow == 5.2.0 pytz future >= 0.15.2 django-sekizai diff --git a/win_requirements.txt b/win_requirements.txt index 8a2f519a81..5e23f6fe67 100644 --- a/win_requirements.txt +++ b/win_requirements.txt @@ -3,9 +3,8 @@ # windows specific pypiwin32 -# general -django > 1.10, < 2.0 -twisted >= 16.0.0 +django > 1.11, < 2.0 +twisted >= 18.0.0, < 19.0.0 pillow == 2.9.0 pytz future >= 0.15.2