Upped twisted requirement to 16.0.0. This because of a backwards incompatible change in Twisted's lLoopingCall that Evennia makes use of. This fixes failings with loading the tutorual world (due to loopingcall errors).
This commit is contained in:
parent
aa1fcfe6e1
commit
402b9a7394
4 changed files with 5 additions and 5 deletions
|
|
@ -66,7 +66,7 @@ class ExtendedLoopingCall(LoopingCall):
|
||||||
if interval < 0:
|
if interval < 0:
|
||||||
raise ValueError("interval must be >= 0")
|
raise ValueError("interval must be >= 0")
|
||||||
self.running = True
|
self.running = True
|
||||||
d = self.deferred = Deferred()
|
deferred = self._deferred = Deferred()
|
||||||
self.starttime = self.clock.seconds()
|
self.starttime = self.clock.seconds()
|
||||||
self.interval = interval
|
self.interval = interval
|
||||||
self._runAtStart = now
|
self._runAtStart = now
|
||||||
|
|
@ -87,7 +87,7 @@ class ExtendedLoopingCall(LoopingCall):
|
||||||
self.interval = real_interval
|
self.interval = real_interval
|
||||||
else:
|
else:
|
||||||
self._scheduleFrom(self.starttime)
|
self._scheduleFrom(self.starttime)
|
||||||
return d
|
return deferred
|
||||||
|
|
||||||
def __call__(self):
|
def __call__(self):
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ PORTAL_PY_FILE = None
|
||||||
|
|
||||||
|
|
||||||
PYTHON_MIN = '2.7'
|
PYTHON_MIN = '2.7'
|
||||||
TWISTED_MIN = '15.2.1'
|
TWISTED_MIN = '16.0.0'
|
||||||
DJANGO_MIN = '1.8'
|
DJANGO_MIN = '1.8'
|
||||||
DJANGO_REC = '1.9'
|
DJANGO_REC = '1.9'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# Evennia dependencies, for Linux/Mac platforms
|
# Evennia dependencies, for Linux/Mac platforms
|
||||||
|
|
||||||
django >= 1.8, < 1.10
|
django >= 1.8, < 1.10
|
||||||
twisted >= 15.2.1
|
twisted >= 16.0.0
|
||||||
mock >= 1.0.1
|
mock >= 1.0.1
|
||||||
pillow == 2.9.0
|
pillow == 2.9.0
|
||||||
pytz
|
pytz
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
pypiwin32
|
pypiwin32
|
||||||
# general
|
# general
|
||||||
django >= 1.8, < 1.10
|
django >= 1.8, < 1.10
|
||||||
twisted >= 15.2.1
|
twisted >= 16.0.0
|
||||||
mock >= 1.0.1
|
mock >= 1.0.1
|
||||||
pillow == 2.9.0
|
pillow == 2.9.0
|
||||||
pytz
|
pytz
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue