Update from upstream

.checkignore

@@ -0,0 +1,7 @@
+# Quantified Code ignore file. https://www.quantifiedcode.com
+
+# Ignore tests folder
+**/tests/**
+**/tests/
+tests/
+

.ciocheck

@@ -0,0 +1,81 @@
+# -----------------------------------------------------------------------------
+# ciocheck
+# https://github.com/ContinuumIO/ciocheck
+# -----------------------------------------------------------------------------
+[ciocheck]
+branch = origin/master
+diff_mode = commited
+file_mode = lines
+check = pep8,pydocstyle,flake8
+enforce = pep8,pydocstyle,flake8
+
+# Python (pyformat)
+add_copyright = true
+add_header = true
+add_init = true
+
+# -----------------------------------------------------------------------------
+# pep8
+# http://pep8.readthedocs.io/en/latest/intro.html#configuration
+# -----------------------------------------------------------------------------
+[pep8]
+exclude = */tests/*
+ignore = E126, E402,
+max-line-length = 79
+
+# -----------------------------------------------------------------------------
+# pydocstyle
+# http://www.pydocstyle.org/en/latest/usage.html#example
+# -----------------------------------------------------------------------------
+[pydocstyle]
+add-ignore = D203
+inherit = false
+
+# -----------------------------------------------------------------------------
+# Flake 8
+# http://flake8.readthedocs.io/en/latest/config.html
+# -----------------------------------------------------------------------------
+[flake8]
+exclude = */tests/*
+ignore = E126, E402,
+max-line-length = 79
+max-complexity = 64
+
+# -----------------------------------------------------------------------------
+# pylint
+# https://pylint.readthedocs.io/en/latest/
+# -----------------------------------------------------------------------------
+#[pylint:messages]
+
+# -----------------------------------------------------------------------------
+# isort
+# https://github.com/timothycrosley/isort/wiki/isort-Settings
+# -----------------------------------------------------------------------------
+[isort]
+from_first = true
+import_heading_stdlib = Standard library imports
+import_heading_thirdparty = Third party imports
+import_heading_firstparty = Local imports
+indent = '    '
+known_first_party = spyder
+known_third_party = 
+line_length = 79
+sections = FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
+
+# -----------------------------------------------------------------------------
+# yapf
+# https://github.com/google/yapf#formatting-style
+# -----------------------------------------------------------------------------
+[yapf:style]
+based_on_style = pep8
+column_limit = 79
+spaces_before_comment = 2
+
+# -----------------------------------------------------------------------------
+# autopep8
+# http://pep8.readthedocs.io/en/latest/intro.html#configuration
+# -----------------------------------------------------------------------------
+[autopep8]
+exclude = */tests/*
+ignore = E126,
+max-line-length = 79

.ciocopyright

@@ -0,0 +1,6 @@
+# -----------------------------------------------------------------------------
+# Copyright (c) Spyder Project Contributors
+#
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+# -----------------------------------------------------------------------------

.coveragerc

@@ -0,0 +1,11 @@
+[run]
+omit =
+    # Omit tests
+    */tests/*
+    # Omit external files
+    */external/*
+    # Omit site files
+    */utils/site/*
+
+[report]
+fail_under=0

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,28 @@
+## Description of your problem
+
+**What steps will reproduce the problem?**
+
+1. 
+2. 
+3. 
+
+**What is the expected output? What do you see instead?**
+
+
+**Please provide any additional information below**
+
+
+## Versions and main components
+
+* Spyder Version:
+* Python Version:
+* Qt Version:
+* PyQt Version:
+* Operating system:
+
+
+## Dependencies
+
+Please go to the menu entry `Help > Optional Dependencies` (or
+`Help > Dependencies`), press the button `Copy to clipboard`
+and paste the contents below:

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,15 @@
+Before submitting your pull request be sure that:
+
+1. You haven't touched any file in the `spyder/defaults` directory.
+  - There is *absolutely* no need to touch those files.
+  - If you want to add new configuration options, please go to
+    `spyder/config/main.py`.
+2. You haven't eliminated unnecessary blank lines or spaces during your work.
+   That makes our reviewing work harder and it could introduce unnecessary
+   conflicts with other pull requests.
+3. You haven't added new icons to Spyder. Please leave decisions about what
+   icons to use to us :)
+
+----
+
+*Note*: You can safely remove this text before submitting your work.

.gitignore

@@ -5,11 +5,18 @@
 *~
 
 # Special dirs and files
-
 build/
 dist/
 bin/
 spyder.egg-info/
 Thumbs.db
 .DS_Store/
 spyder_crash.log
+.DS_Store
+.spyderproject
+.idea/
+.cache
+.coverage
+
+# git .orig files
+*.orig

.travis.yml

@@ -0,0 +1,39 @@
+# https://travis-ci.org/spyder-ide/spyder
+
+language: python
+dist: trusty
+sudo: false
+
+matrix:
+  include:
+    # This never ends!
+    #- python: "2.7"
+    #  env: TEST_MODULES=false
+    #  os: linux
+    - python: "2.7"
+      env: TEST_MODULES=true
+      os: linux
+    - python: "3.5"
+      env: TEST_MODULES=false
+      os: linux
+    - python: "3.5"
+      env: TEST_MODULES=true
+      os: linux
+    - python: "3.4"
+      env: TEST_MODULES=false
+      os: linux
+
+before_install:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+
+install:
+  - ./continuous_integration/install.sh;
+
+script:
+  - |
+    if [ "$TEST_MODULES" = "true" ]; then
+        ./continuous_integration/travis/modules_test.sh
+    else
+        ./continuous_integration/travis/test-qt4.sh
+    fi

AUTHORS

@@ -1,46 +1,5 @@
-Main author
-===========
+The Spyder Project Contributors is composed of:
 
-Pierre Raybaut <pierre.raybaut@gmail.com>
-
-Current maintainer
-==================
-
-Carlos Cordoba <ccordoba12@gmail.com>
-
-Contributors
-============
-
-Steven Sylvester <steven.silvester@ieee.org>
-Gonzalo Peña-Castellanos <goanpeca@gmail.com>
-Anatoly Techtonick <techtonik@gmail.com>
-Sylvain Corlay <sylvain.corlay@gmail.com>
-Daniel Høegh <dhoegh91@gmail.com>
-Jed Ludlow <jed.ludlow@gmail.com>
-Joseph Martinot-Lagarde
-Hans Fangohr <fangohr@soton.ac.uk>
-Eric Larson <larson.eric.d@gmail.com>
-Alok Talekar
-Caleb Hattingh <caleb.hattingh@gmail.com>
-stonebig       
-Thomas Kluyver <takowl@gmail.com>
-randy.heydon@clockworklab.net
-Cybjit <cybjit@gmail.com>
-Enfenion <enfo42@gmail.com>
-Karan Uppal <karan.uppal711@gmail.com>
-Alex@ruby.cable.virginmedia.net
-Ronan
-TWAC
-robrosit@gmail.com
-David Joy <videan42@gmail.com>
-David Powell
-Alex Fargus <alex.fargus@gmail.com>
-alfonso.137.718@gmail.com
-benjamin.drung@profitbricks.com
-bioruffo
-Javier Dehesa <javidcf@gmail.com>
-Robert Pollak <robert.pollak@mykolab.com>
-robrosit
-Ronan Paixao <ronanpaixao@gmail.com>
-sandorracz@rnumerics.com
-vitoace
+* Pierre Raybaut <pierre.raybaut@gmail.com> (Main Spyder author)
+* Carlos Cordoba <ccordoba12@gmail.com> (Current maintainer)
+* All other developers that have contributed to this repository