Merge branch 'master' into fix_history

.circleci/config.yml

@@ -0,0 +1,51 @@
+version: 2
+
+main: &main
+    machine: true
+    steps:
+      - checkout
+      - run:
+          command: docker pull dorowu/ubuntu-desktop-lxde-vnc:xenial
+      - run:
+          name: Install system packages
+          command: |
+            sudo apt-get -qq update
+            sudo apt-get install libegl1-mesa
+      - run:
+          command: ./continuous_integration/travis/install.sh
+      - run:
+          command: ./continuous_integration/circle/modules_test.sh || ./continuous_integration/circle/modules_test.sh
+
+jobs:
+  python2.7:
+    <<: *main
+    environment:
+      - PYTHON_VERSION: "2.7"
+      - USE_CONDA: "yes"
+
+  python3.5:
+    <<: *main
+    environment:
+      - PYTHON_VERSION: "3.5"
+      - USE_CONDA: "no"
+
+  python3.6:
+    <<: *main
+    environment:
+      - PYTHON_VERSION: "3.6"
+      - USE_CONDA: "yes"
+
+  python3.7:
+    <<: *main
+    environment:
+      - PYTHON_VERSION: "3.7"
+      - USE_CONDA: "yes"
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - python2.7
+      - python3.5
+      - python3.6
+      - python3.7

.codecov.yml

@@ -1,6 +1,6 @@
 codecov:
   notify:
-    require_ci_to_pass: yes
+    require_ci_to_pass: no
 
 codecov:
   branch: master
@@ -9,20 +9,20 @@ coverage:
   precision: 2
   round: down
   range: "70...100"
-  
+
   status:
     project:
       default:
         threshold: 1%
     patch: no
     changes: no
-    
+
 parsers:
   gcov:
     branch_detection:
       conditional: yes
       loop: yes
       method: no
       macro: no
-   
+
 comment: false

.coveragerc

@@ -8,4 +8,11 @@ omit =
     */utils/site/*
 
 [report]
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
+
+    # Don't complain if non-runnable code isn't run
+    if __name__ == .__main__.:
 fail_under=0

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,34 +1,37 @@
-<!--- Before submitting your pull request --->
-<!--- please complete as much as possible of the following checklist: --->
+<!--- Make sure to read the Contributing Guidelines:                   --->
+<!--- https://github.com/spyder-ide/spyder/blob/master/CONTRIBUTING.md --->
+<!--- and follow PEP 8, PEP 257 and Spyder's code style:               --->
+<!--- https://github.com/spyder-ide/spyder/wiki/Dev:-Coding-Style      --->
 
-### Pull Request Checklist
+## Description of Changes
 
-* [ ] Read and followed this repo's [Contributing Guidelines](https://github.com/spyder-ide/spyder/blob/master/CONTRIBUTING.md)
-* [ ] Based your PR on the latest version of the correct branch (master or 3.x)
-* [ ] Followed [PEP8](https://www.python.org/dev/peps/pep-0008/) for code style
-* [ ] Ensured your pull request hasn't eliminated unrelated blank lines/spaces,
-      modified the ``spyder/defaults`` directory, or added new icons/assets
-* [ ] Wrote at least one-line docstrings for any new functions
-* [ ] Added at least one unit test covering the changes, if at all possible
-* [ ] Described your changes and the motivation for them below
-* [ ] Noted what issue(s) this pull request resolves, creating one if needed
-* [ ] Included a screenshot, if this PR makes any visible changes to the UI
 
+* [ ] Wrote at least one-line docstrings (for any new functions)
+* [ ] Added unit test(s) covering the changes (if testable)
+<!--- Remember that an image/animation is worth a thousand words! --->
+* [ ] Included a screenshot or animation (if affecting the UI, see [Licecap](https://www.cockos.com/licecap/))
 
-## Description of Changes
 
-<!--- Describe what you've changed and why. --->
+<!--- Explain what you've done and why --->
 
 
 
 
 ### Issue(s) Resolved
 
-<!--- Pull requests should typically resolve one, preferably only one --->
-<!--- outstanding issue; create a new one if no relevant issue exists. --->
-<!--- List the issue(s) below, in the form "Fixes #1234" . One per line.--->
+<!--- List the issue(s) below, in the form "Fixes #1234"; one per line --->
 
 Fixes #
 
 
+### Affirmation
+
+By submitting this Pull Request or typing my (user)name below,
+I affirm the [Developer Certificate of Origin](https://developercertificate.org)
+with respect to all commits and content included in this PR,
+and understand I am releasing the same under Spyder's MIT (Expat) license.
+
+<!--- TYPE YOUR USER/NAME AFTER THE FOLLOWING: --->
+I certify the above statement is true and correct:
+
 <!--- Thanks for your help making Spyder better for everyone! --->

.gitignore

@@ -26,3 +26,10 @@ spyder_crash.log
 
 # git .orig files
 *.orig
+
+# log files
+*.log
+
+# Rope project folders
+.ropeproject/
+.vscode/

.travis.yml

@@ -1,44 +1,35 @@
 # https://travis-ci.org/spyder-ide/spyder
 
-language: python
-dist: trusty
-sudo: false
+language: generic
+dist: xenial
+services:
+    - xvfb
+env:
+  global:
+    - CI_PYTEST: "true"
 
 matrix:
+  fast_finish: true
   include:
-    - python: "2.7"
-      env: USE_PYQT=pyqt4
-      os: linux
-    - python: "2.7"
-      env: USE_PYQT=pyqt5
-      os: linux
-    - python: "3.5"
-      env: USE_PYQT=pyqt4
-      os: linux
-    # This slot runs our tests only with pip packages
-    - python: "3.5"
-      env: USE_PYQT=pyqt5
-      os: linux
-    - python: "3.6"
-      env: USE_PYQT=pyqt5
-      os: linux
+    - env: PYTHON_VERSION=2.7 USE_CONDA=yes
+    - env: PYTHON_VERSION=3.6 USE_CONDA=yes
+    - env: PYTHON_VERSION=3.7 USE_CONDA=yes
+    - env: PYTHON_VERSION=3.6 USE_CONDA=no
+    - env: PYTHON_VERSION=3.7 USE_CONDA=no
 
 before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
   # Avoid annoying focus problems when running tests
   # See discussion in e.g. https://github.com/spyder-ide/spyder/pull/6132
   - sudo apt-get -qq update
-  - sudo apt-get install -y matchbox-window-manager
+  - sudo apt-get install -y matchbox-window-manager xterm libxkbcommon-x11-0
+  - matchbox-window-manager&
+  - sleep 5
 
 install:
-  - ./continuous_integration/travis/install.sh;
-  - ./continuous_integration/travis/install-qt.sh;
-  - DISPLAY=:99 matchbox-window-manager &
-  - sleep 5
+  - ./continuous_integration/travis/install.sh
 
 script:
-  - ./continuous_integration/travis/runtests.sh || ./continuous_integration/travis/runtests.sh || ./continuous_integration/travis/runtests.sh;
+  - ./continuous_integration/travis/runtests.sh || ./continuous_integration/travis/runtests.sh || ./continuous_integration/travis/runtests.sh || ./continuous_integration/travis/runtests.sh
 
 after_success:
-  - export PATH="$HOME/miniconda/bin:$PATH" && source activate test && coveralls
+  - source $HOME/miniconda/etc/profile.d/conda.sh && conda activate test && coveralls

AUTHORS.txt

@@ -0,0 +1,25 @@
+The Spyder Project Contributors is composed of:
+
+* Pierre Raybaut <[email protected]> (Main Spyder author)
+* Carlos Cordoba <[email protected]> (Current maintainer)
+* All other developers that have contributed to the spyder repository:
+  <https://github.com/spyder-ide/spyder/graphs/contributors>
+
+Additionally, some assets and code were originally sourced from third-party
+authors or projects, including:
+
+* The icons for the Spyder 3 theme are derived from Font Awesome, by
+  David Gandy <https://fontawesome.com/>
+* Most Spyder 2 theme icons are sourced from the Crystal Project icon set, by
+  Everaldo Coelho <https://www.everaldo.com>
+* Other Spyder 2 icons are from Yusuke Kamiyamane's icon sets, by
+  Yusuke Kamiyamane <http://p.yusukekamiyamane.com/>
+* As well as the FamFamFam Silk icon set, by
+  Mark James <http://www.famfamfam.com/lab/icons/silk/>
+* And the KDE Oxygen icons, by
+  The KDE Artists <https://www.kde.org/>
+
+For information about the sources and authors of other third-party code
+and other resources used, please see the NOTICE.txt file, located in the
+root of the spyder repository or online at:
+<https://github.com/spyder-ide/spyder/blob/master/NOTICE.txt>