Merge from 4.x: PR spyder-ide#11854

Author: ccordoba12

binder/environment.yml

@@ -27,7 +27,7 @@ dependencies:
 - pylint >=0.25
 - pyqt <5.13
 - pyyaml
-- python-language-server >=0.31.2,<0.32.0
+- python-language-server >=0.31.9,<0.32.0
 - pyxdg >=0.26
 - pyzmq >=17
 - qdarkstyle >=2.8

continuous_integration/azure/install.sh

@@ -24,11 +24,6 @@ if [ "$USE_CONDA" = "yes" ]; then
 
     # Install python-language-server from Github with no deps
     pip install -q --no-deps git+https://github.com/palantir/python-language-server
-
-    # Avoid problems with wrong jupyter_client version being picked up
-    if [ "$PYTHON_VERSION" = "2.7" ]; then
-        conda install -q -y jupyter_client=5.3.4
-    fi
 else
     # Github backend tests are failing with 1.1.1d
     conda install -q -y openssl=1.1.1c

continuous_integration/travis/install.sh

@@ -39,11 +39,6 @@ if [ "$USE_CONDA" = "yes" ]; then
 
     # Install python-language-server from Github with no deps
     pip install -q --no-deps git+https://github.com/palantir/python-language-server
-
-    # Avoid problems with wrong jupyter_client version being picked up
-    if [ "$PYTHON_VERSION" = "2.7" ]; then
-        conda install -q -y jupyter_client=5.3.4
-    fi
 else
     # Downgrade to Python 3.7.3 because 3.7.4 is not pulling
     # wheels for all packages

requirements/conda.txt

@@ -21,7 +21,9 @@ psutil >=5.3
 pygments >=2.0
 pylint >=0.25
 pyqt <5.13
-python-language-server >=0.31.2,<0.32.0
+# There's no need to set a version for python-language-server
+# because we install it from master for our tests.
+python-language-server
 pyxdg >=0.26
 pyzmq >=17
 qdarkstyle >=2.8

setup.py

@@ -226,7 +226,7 @@ def run(self):
     'pylint>=0.25',
     'pyqt5<5.13;python_version>="3"',
     'pyqtwebengine<5.13;python_version>="3"',
-    'python-language-server[all]>=0.31.2,<0.32.0',
+    'python-language-server[all]>=0.31.9,<0.32.0',
     'pyxdg>=0.26;platform_system=="Linux"',
     'pyzmq>=17',
     'qdarkstyle>=2.8',

spyder/dependencies.py

@@ -47,7 +47,7 @@
 PSUTIL_REQVER = '>=5.3'
 PYGMENTS_REQVER = '>=2.0'
 PYLINT_REQVER = '>=0.25'
-PYLS_REQVER = '>=0.31.2;<0.32.0'
+PYLS_REQVER = '>=0.31.9;<0.32.0'
 PYXDG_REQVER = '>=0.26'
 PYZMQ_REQVER = '>=17'
 QDARKSTYLE_REQVER = '>=2.8'

spyder/tests/test_dependencies_in_sync.py

@@ -205,6 +205,11 @@ def test_dependencies_for_binder_in_sync():
     if 'pytest-xvfb' in spyder_env:
         spyder_env.pop('pytest-xvfb')
 
+    # There's no need to test for this because we install it
+    # from master in some cases.
+    for req in [spyder_env, spyder_reqs]:
+        req.pop('python-language-server')
+
     # Check that the requirement files match the environment yaml file
     full_reqs = {}
     full_reqs.update(test_reqs)
@@ -220,10 +225,11 @@ def test_dependencies_for_spyder_dialog_in_sync():
     spyder_deps = parse_spyder_dependencies()
     spyder_reqs = parse_requirements(REQ_FPATH)
 
-    # No need to check for spyder-kernels because we're using
-    # a subrepo for it in some cases
+    # No need to check for these deps because either we're using
+    # a subrepo for them or we're installing them from master.
     for req in [spyder_deps, spyder_reqs]:
         req.pop('spyder-kernels')
+        req.pop('python-language-server')
 
     if 'pyqt' in spyder_reqs:
         spyder_reqs.pop('pyqt')
@@ -245,10 +251,11 @@ def test_dependencies_for_spyder_setup_install_requires_in_sync():
     spyder_setup = parse_setup_install_requires(SETUP_FPATH)
     spyder_reqs = parse_requirements(REQ_FPATH)
 
-    # No need to check for spyder-kernels because we're using
-    # a subrepo for it in some cases
+    # No need to check for these deps because either we're using
+    # a subrepo for them or we're installing them from master.
     for req in [spyder_reqs, spyder_setup]:
         req.pop('spyder-kernels')
+        req.pop('python-language-server')
 
     # rtree is only available through conda
     if 'rtree' in spyder_reqs: