Skip to content

Commit

Permalink
drop tornado<5 in setup.py, tox.ini
Browse files Browse the repository at this point in the history
 - flake8 clean-up
 - example3 fixed
 - add unreleased changelog in doc
  • Loading branch information
unkcpz committed Jun 16, 2020
1 parent bc19b02 commit 518714a
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions circus/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ def call(self, cmd):

try:
future = concurrent.Future()

def cb(msg, status):
future.set_result(msg)
self.stream.send(cmd, callback=cb)
Expand Down
1 change: 1 addition & 0 deletions circus/tests/support.py
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@ def is_alive(self):
def stop(self):
pass


class MagicMockFuture(mock.MagicMock, concurrent.futures.Future):

def cancel(self):
Expand Down
2 changes: 1 addition & 1 deletion circus/tests/test_arbiter.py
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,7 @@ def test_plugins(self):
loop=get_ioloop())

def incr_processes(cli):
# return a coroutine if cli is Async
return cli.send_message('incr', name='test')

# wait for the plugin to be started
Expand All @@ -511,7 +512,6 @@ def incr_processes(cli):
res = yield cli.send_message('list', name='test')
self.assertEqual(len(res.get('pids')), 1)

# XXX: NOT SURE, yield make procedure sync
yield incr_processes(cli)
res = yield cli.send_message('list', name='test')
self.assertEqual(len(res.get('pids')), 2)
Expand Down
1 change: 1 addition & 0 deletions docs/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Changelog history
unreleased
----------

- Drop support for tornado<5 and start using asyncio eventl loop - #1129
- Fix mem_info readings to be more reliable - #1128
- Drop support for Python 2.7 & 3.4 - #1126
- Speedup reloadconfig for large number of sockets - #1121
Expand Down
3 changes: 2 additions & 1 deletion examples/test.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
#!/bin/sh
;sleep 1
sleep 1
echo "@@@"
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
raise SystemExit("Circus requires Python 3.5 or higher.")


install_requires = ['psutil', 'pyzmq>=17.0', 'tornado>=3.0,<5.0']
install_requires = ['psutil', 'pyzmq>=17.0', 'tornado>=5.0.2']

try:
import argparse # NOQA
Expand Down Expand Up @@ -46,7 +46,6 @@
'gevent',
'papa',
'PyYAML',
'tornado>=3.0,<5.0',
'pyzmq>=17.0',
'flake8==2.1.0',
],
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ deps =
gevent
papa
PyYAML
tornado>=3.0,<5.0
tornado>=5.0.2
pyzmq>=17.0

setenv =
Expand Down

0 comments on commit 518714a

Please sign in to comment.