From ad1f2b1ee02706112daa1088b996041191bb86aa Mon Sep 17 00:00:00 2001 From: Stephannie Jimenez Date: Wed, 12 Aug 2020 11:36:37 -0500 Subject: [PATCH 1/2] update ujson dependency --- setup.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/setup.py b/setup.py index f3c465db..821929c6 100755 --- a/setup.py +++ b/setup.py @@ -1,9 +1,23 @@ #!/usr/bin/env python from setuptools import find_packages, setup import versioneer +import sys README = open('README.rst', 'r').read() +install_requires = [ + 'configparser; python_version<"3.0"', + 'future>=0.14.0; python_version<"3"', + 'backports.functools_lru_cache; python_version<"3.2"', + 'jedi>=0.17.0,<0.18.0', + 'python-jsonrpc-server>=0.3.2', + 'pluggy'] + +if sys.version_info[0] == 2: + install_requires.append('ujson<=2.0.3; platform_system!="Windows"') +else: + install_requires.append('ujson>=3.0.0') + setup( name='python-language-server', @@ -31,15 +45,7 @@ # your project is installed. For an analysis of "install_requires" vs pip's # requirements files see: # https://packaging.python.org/en/latest/requirements.html - install_requires=[ - 'configparser; python_version<"3.0"', - 'future>=0.14.0; python_version<"3"', - 'backports.functools_lru_cache; python_version<"3.2"', - 'jedi>=0.17.0,<0.18.0', - 'python-jsonrpc-server>=0.3.2', - 'pluggy', - 'ujson<=1.35; platform_system!="Windows"' - ], + install_requires=install_requires, # List additional groups of dependencies here (e.g. development # dependencies). You can install these using the following syntax, From 52cd57edbf9aa5e600cdba3a899f38528bd7cf3b Mon Sep 17 00:00:00 2001 From: Stephannie Jimenez Gacha Date: Thu, 10 Sep 2020 00:03:02 -0500 Subject: [PATCH 2/2] Update jsonrpc server dependency Co-authored-by: Carlos Cordoba --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 192ff30f..b967efc6 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ 'future>=0.14.0; python_version<"3"', 'backports.functools_lru_cache; python_version<"3.2"', 'jedi>=0.17.0,<0.18.0', - 'python-jsonrpc-server>=0.3.2', + 'python-jsonrpc-server>=0.4.0', 'pluggy'] if sys.version_info[0] == 2: