From 171d13777615804ab0a1ca35709537f6d3478381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9lio=20Meira=20Lins?= Date: Sun, 8 Jan 2017 17:21:04 -0300 Subject: [PATCH] event_loop/uv.py: Conform to pyuv 1.0 API (#240) Closes #88 * Specify minimum pyuv version where possible. * Add extras_require for pyuv. `pip install neovim[pyuv]` --- neovim/msgpack_rpc/event_loop/uv.py | 11 +++++------ setup.py | 6 +++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/neovim/msgpack_rpc/event_loop/uv.py b/neovim/msgpack_rpc/event_loop/uv.py index 449d28ea..6a912c27 100644 --- a/neovim/msgpack_rpc/event_loop/uv.py +++ b/neovim/msgpack_rpc/event_loop/uv.py @@ -73,12 +73,11 @@ def _connect_child(self, argv): flags=pyuv.UV_CREATE_PIPE + pyuv.UV_WRITABLE_PIPE) stderr = pyuv.StdIO(self._error_stream, flags=pyuv.UV_CREATE_PIPE + pyuv.UV_WRITABLE_PIPE) - self._process = pyuv.Process(self._loop) - self._process.spawn(file=argv[0], - exit_callback=self._on_exit, - args=argv[1:], - flags=pyuv.UV_PROCESS_WINDOWS_HIDE, - stdio=(stdin, stdout, stderr,)) + pyuv.Process.spawn(self._loop, + args=argv, + exit_callback=self._on_exit, + flags=pyuv.UV_PROCESS_WINDOWS_HIDE, + stdio=(stdin, stdout, stderr,)) self._error_stream.start_read(self._on_read) def _start_reading(self): diff --git a/setup.py b/setup.py index 9e948b96..78838885 100644 --- a/setup.py +++ b/setup.py @@ -7,9 +7,12 @@ install_requires = [ 'msgpack-python>=0.4.0', ] +extras_require = { + 'pyuv': ['pyuv>=1.0.0'], +} if os.name == 'nt': - install_requires.append('pyuv') + install_requires.append('pyuv>=1.0.0') elif sys.version_info < (3, 4): # trollius is just a backport of 3.4 asyncio module install_requires.append('trollius') @@ -29,4 +32,5 @@ packages=['neovim', 'neovim.api', 'neovim.msgpack_rpc', 'neovim.msgpack_rpc.event_loop', 'neovim.plugin'], install_requires=install_requires, + extras_require=extras_require, zip_safe=False)