Remove ujson dependency on Windows (requires MSVC compiler) (#704)

palantir · Dec 2, 2019 · 143d993 · 143d993
1 parent c3bb2f2
commit 143d993
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/pyls/__main__.py b/pyls/__main__.py
@@ -4,7 +4,10 @@
 import logging.config
 import sys
 
-import ujson as json
+try:
+    import ujson as json
+except Exception:  # pylint: disable=broad-except
+    import json
 
 from .python_ls import (PythonLanguageServer, start_io_lang_server,
                         start_tcp_lang_server)

diff --git a/pyls/plugins/pylint_lint.py b/pyls/plugins/pylint_lint.py
@@ -4,10 +4,14 @@
 import logging
 import sys
 
-import ujson as json
 from pylint.epylint import py_run
 from pyls import hookimpl, lsp
 
+try:
+    import ujson as json
+except Exception:  # pylint: disable=broad-except
+    import json
+
 log = logging.getLogger(__name__)
 
 

diff --git a/setup.py b/setup.py
@@ -36,9 +36,9 @@
         'future>=0.14.0; python_version<"3"',
         'backports.functools_lru_cache; python_version<"3.2"',
         'jedi>=0.14.1,<0.16',
-        'python-jsonrpc-server>=0.3.0',
+        'python-jsonrpc-server>=0.3.2',
         'pluggy',
-        'ujson<=1.35'
+        'ujson<=1.35; platform_system!="Windows"'
     ],
 
     # List additional groups of dependencies here (e.g. development