Skip to content

Commit

Permalink
Upped twisted requirement to 16.0.0. This because of a backwards inco…
Browse files Browse the repository at this point in the history
…mpatible change in Twisted's lLoopingCall that Evennia makes use of. This fixes failings with loading the tutorual world (due to loopingcall errors).
  • Loading branch information
Griatch committed Mar 24, 2016
1 parent aa1fcfe commit 402b9a7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions evennia/scripts/scripts.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def start(self, interval, now=True, start_delay=None, count_start=0):
if interval < 0:
raise ValueError("interval must be >= 0")
self.running = True
d = self.deferred = Deferred()
deferred = self._deferred = Deferred()
self.starttime = self.clock.seconds()
self.interval = interval
self._runAtStart = now
Expand All @@ -87,7 +87,7 @@ def start(self, interval, now=True, start_delay=None, count_start=0):
self.interval = real_interval
else:
self._scheduleFrom(self.starttime)
return d
return deferred

def __call__(self):
"""
Expand Down
2 changes: 1 addition & 1 deletion evennia/server/evennia_launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@


PYTHON_MIN = '2.7'
TWISTED_MIN = '15.2.1'
TWISTED_MIN = '16.0.0'
DJANGO_MIN = '1.8'
DJANGO_REC = '1.9'

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Evennia dependencies, for Linux/Mac platforms

django >= 1.8, < 1.10
twisted >= 15.2.1
twisted >= 16.0.0
mock >= 1.0.1
pillow == 2.9.0
pytz
Expand Down
2 changes: 1 addition & 1 deletion win_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
pypiwin32
# general
django >= 1.8, < 1.10
twisted >= 15.2.1
twisted >= 16.0.0
mock >= 1.0.1
pillow == 2.9.0
pytz
Expand Down

0 comments on commit 402b9a7

Please sign in to comment.