Merge branch 'find_in_files_bar' of github.com:andfoy/spyder into fin…

…d_in_files_bar Merge!
spyder-ide · May 13, 2017 · 0840e74 · 0840e74
2 parents 4ae7238 + bec5c0d
commit 0840e74
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -17,7 +17,7 @@ environment:
 
   matrix:
     - PYTHON_VERSION: "2.7"
-    - PYTHON_VERSION: "3.6"
+    #- PYTHON_VERSION: "3.6"
 
 platform:
   -x64

diff --git a/continuous_integration/install.sh b/continuous_integration/install.sh
@@ -7,10 +7,10 @@ if [ "$CIRCLE_NODE_INDEX" = "3" ]; then
     export CONDA_DEPENDENCIES=""
 else
     export CONDA_DEPENDENCIES_FLAGS="--quiet"
-    export CONDA_DEPENDENCIES="rope pyflakes sphinx pygments pylint pycodestyle psutil nbconvert \
+    export CONDA_DEPENDENCIES="rope pyflakes sphinx pygments pylint psutil nbconvert \
                                qtawesome pickleshare qtpy pyzmq chardet mock nomkl pandas \
                                pytest pytest-cov numpydoc scipy cython pillow"
-    export PIP_DEPENDENCIES="coveralls pytest-qt pytest-xvfb flaky jedi"
+    export PIP_DEPENDENCIES="coveralls pytest-qt pytest-xvfb flaky jedi pycodestyle"
 fi