Merge from 3.x: PR #7075

spyder-ide · May 6, 2018 · 52d5a91 · 52d5a91
2 parents 3732239 + 8107f33
commit 52d5a91
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -47,8 +47,6 @@ install:
   - "conda install jupyter_client=5.2.2"
   # Fix problems with latest pyqt
   - "conda install pyqt=5.6*"
-  # Fix test issues with the latest jedi 0.12 for now
-  - "conda install jedi=0.11.1"
 
 build: false
 

diff --git a/continuous_integration/travis/install.sh b/continuous_integration/travis/install.sh
@@ -36,16 +36,10 @@ if [ "$TRAVIS_PYTHON_VERSION" = "3.5" ] && [ "$USE_PYQT" = "pyqt5" ]; then
 
     # Fix connection to external kernels
     pip install jupyter-client==5.2.2
-
-    # Avoid test failures with the latest jedi 0.12 for now
-    pip install jedi==0.11.1
 else
     # Run with tornado < 5.0 to avoid hangs
     conda install tornado=4.5.3
 
     # Fix connection to external kernels
     conda install jupyter_client=5.2.2
-
-    # Avoid test failures with the latest jedi 0.12 for now
-    conda install jedi=0.11.1
 fi