From c5f590e5325c59db227cc3491993cc49b36021cb Mon Sep 17 00:00:00 2001 From: goanpeca Date: Tue, 12 May 2020 11:10:27 -0500 Subject: [PATCH 1/2] Update ujson dependency --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index f3c465db..0baff1e0 100755 --- 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.17.0,<0.18.0', - 'python-jsonrpc-server>=0.3.2', + 'python-jsonrpc-server>=0.3.3', 'pluggy', - 'ujson<=1.35; platform_system!="Windows"' + 'ujson>=2' ], # List additional groups of dependencies here (e.g. development From 9fa546b046c6dcbd65bd0b25c0bd58a05eaa2db2 Mon Sep 17 00:00:00 2001 From: goanpeca Date: Mon, 15 Jun 2020 19:22:14 -0500 Subject: [PATCH 2/2] test --- setup.py | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/setup.py b/setup.py index 0baff1e0..40a3aa05 100755 --- a/setup.py +++ b/setup.py @@ -1,10 +1,28 @@ #!/usr/bin/env python from setuptools import find_packages, setup +import os +import sys import versioneer 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.3', + 'pluggy', +] + +if sys.version_info[0] == 2: + if os.name != 'nt': + install_requires.append('ujson<=1.35') +else: + install_requires.append('ujson>=2') + + setup( name='python-language-server', @@ -31,15 +49,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.3', - 'pluggy', - 'ujson>=2' - ], + install_requires=install_requires, # List additional groups of dependencies here (e.g. development # dependencies). You can install these using the following syntax,