Remove external dependencies

README.md

@@ -108,11 +108,13 @@ separately after installing Python.
 
 ## Running from source
 
-The fastest way to run Spyder is to get the source code, install PyQt4, PyQt5
-or PySide, and run:
+The fastest way to run Spyder is to get the source code using git, install
+PyQt4, PyQt5 or PySide, and run these commands:
+
+1. `pip install qtawesome` or `conda install -c spyder-ide qtawesome`
+2. `cd /your/spyder/git-clone`
+3. `python bootstrap.py`
 
-    python bootstrap.py
-
 You may want to do this for fixing bugs in Spyder, adding new
 features, learning how Spyder works or just getting a taste of it.
 

bootstrap.py

@@ -103,11 +103,6 @@
 sys.path.insert(0, DEVPATH)
 print("01. Patched sys.path with %s" % DEVPATH)
 
-EXTPATH = osp.join(DEVPATH, 'external-py' + sys.version[0])
-if osp.isdir(EXTPATH):
-    sys.path.insert(0, EXTPATH)
-    print("                      and %s" % EXTPATH)
-
 
 # Selecting the GUI toolkit: PyQt5 if installed, otherwise PySide or PyQt4
 # (Note: PyQt4 is still the officially supported GUI toolkit for Spyder)

continuous_integration/appveyor/install.ps1

@@ -83,8 +83,10 @@ function UpdateConda ($python_home) {
     $conda_path = $python_home + "\Scripts\conda.exe"
     Write-Host "Updating conda..."
     $args = "update --yes conda"
+    $channel_args = "config --add channels spyder-ide"
     Write-Host $conda_path $args
     Start-Process -FilePath "$conda_path" -ArgumentList $args -Wait -Passthru
+    Start-Process -FilePath "$conda_path" -ArgumentList $channel_args -Wait -Passthru
 }
 
 

continuous_integration/conda-recipes/spyder/meta.yaml

@@ -31,7 +31,7 @@ requirements:
     - pep8
     - psutil
     - pylint                 [not win]
-    - six
+    - qtawesome
     - python.app             [osx]
 
 about:

continuous_integration/travis/install.sh

@@ -54,8 +54,8 @@ install_conda()
         conda create -q -n test-environment python=$PY_VERSION;
     fi
 
-    # Add our own channel for PyQt5 tests
-    if [ "$USE_QT_API" = "PyQt5" ]; then
+    # Add our own channel for our own packages
+    if [ "$USE_CONDA" = true ]; then
         conda config --add channels spyder-ide;
     fi
 }