Fix PyLS requirements and add Jedi 0.14.1 as a new dependency for now

spyder-ide · Oct 28, 2019 · 299f9d2 · Jeroendevr · Oct 29, 2019 · ccordoba12
1 parent e94eb0e
commit 299f9d2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/requirements/conda.txt b/requirements/conda.txt
@@ -2,6 +2,7 @@ atomicwrites
 chardet >=2.0.0
 cloudpickle
 diff-match-patch
+jedi =0.14.1
 keyring
 nbconvert
 numpydoc
@@ -12,7 +13,7 @@ pygments >=2.0
 pylint
 pympler
 pyqt <5.13
-python-language-server >=0.29.2
+python-language-server >=0.29.2,<0.30.0
 pyxdg
 pyzmq
 qdarkstyle >=2.7

diff --git a/setup.py b/setup.py
@@ -228,13 +228,16 @@ def run(self):
     # pyqtwebengine module
     'pyqtwebengine<5.13;python_version>="3"',
     # Pyls with all its dependencies
-    'python-language-server[all]>=0.28.3,<0.29.0',
+    'python-language-server[all]>=0.29.2,<0.30.0',
     # Required to get SSH connections to remote kernels
     'pexpect',
     'paramiko;platform_system=="Windows"',
     # Required for accesing xdg spec on Linux
     'pyxdg>=0.26;platform_system=="Linux"',
-    'pympler'
+    'pympler',
+    # Pseudo-dependency. To be removed when Jedi fixes completions
+    # for Numpy and Pandas
+    'jedi==0.14.1'
 ]
 
 extras_require = {