Skip to content

Latest commit

 

History

History
331 lines (205 loc) · 14.8 KB

CONTRIBUTING.md

File metadata and controls

331 lines (205 loc) · 14.8 KB

Contributing to Spyder

👍🎉 First off, thanks for taking the time to contribute to Spyder! 🎉👍

General Guidelines

This page documents at a very high level how to contribute to Spyder. Please check the Spyder IDE Contributor Documentation for a more detailed guide on how to do so. Also, make sure you're familiar with our Github workflow.

Troubleshooting

Before posting a report, please carefully read our Troubleshooting Guide and search the issue tracker for your error message and problem description, as the great majority of bugs are either duplicates, or can be fixed on the user side with a few easy steps. Thanks!

Submitting a Helpful Issue

Submitting useful, effective and to-the-point issue reports can go a long way toward improving Spyder for everyone. Accordingly, please read the relevant section of the Spyder Troubleshooting Guide, which describes in detail how to do just that.

Most importantly, aside from the error message/traceback and the requested environment/dependency information, please be sure you include a detailed, step by step description of exactly what triggered the problem. Otherwise, we likely won't be able to find and fix it, and your issue will have to be closed after a week (7 days). Thanks!

Setting Up a Development Environment

Forking and cloning the repo

First, navigate to the Spyder repo in your web browser and press the Fork button to make a personal copy of the repository on your own Github account. Then, click the Clone or Download button on your repository, copy the link and run the following on the command line to clone the repo:

$ git clone <LINK-TO-YOUR-REPO>

Finally, set the upstream remote to the official Spyder repo with:

$ git remote add upstream https://github.com/spyder-ide/spyder.git

Creating an environment and installing dependencies

If you use Anaconda or Conda-forge, you can create an environment and install the necessary dependencies as follows:

$ conda create -n spyder-dev -c conda-forge python=3.9
$ conda activate spyder-dev
$ conda env update --file requirements/main.yml

After doing that, you need to install Spyder's specific dependencies per operating system. For instance, if you're working on macOS you need to run

$ conda env update --file requirements/macos.yml

You can also use virtualenv on Linux, but conda is strongly recommended:

$ mkvirtualenv spyder-dev
$ workon spyder-dev
(spyder-dev) $ pip install -e .

Running Spyder

To run Spyder from your clone in its development mode, with extra checks and options (pass --help to see them), launch it via the bootstrap.py script in the repo root directory:

$ python bootstrap.py

Note that if you are running on macOS 10.15 or earlier, you will need to call pythonw instead of python.

To start Spyder in debug mode, useful for tracking down an issue, you can run:

$ python bootstrap.py --debug

Important Note: To test any changes you've made to the Spyder source code, you need to restart Spyder or start a fresh instance (you can run multiple copies simultaneously by unchecking the Preferences option Use a single instance under General > Advanced Settings .

Running tests

To install our test dependencies under Anaconda:

$ conda env update --file requirements/tests.yml

If using pip (for experts only), run the following from the directory where your git clone is stored:

$ pip install -e .[test]

To run the Spyder test suite, please use (from the spyder root directory):

$ python runtests.py

Spyder Branches

When you start to work on a new pull request (PR), you need to be sure that your work is done on top of the correct Spyder branch, and that you base your PR on Github against it.

To guide you, issues on Github are marked with a milestone that indicates the correct branch to use. If not, follow these guidelines:

  • Use the 5.x branch for bugfixes only (e.g. milestones v5.0.1 or v5.1.2)
  • Use master to introduce new features or break compatibility with previous Spyder versions (e.g. milestones v6.0beta1 or v6.0beta2).

You should also submit bugfixes to 5.x or master for errors that are only present in those respective branches.

To start working on a new PR, you need to execute these commands, filling in the branch names where appropriate:

$ git checkout <SPYDER-BASE-BRANCH>
$ git pull upstream <SPYDER-BASE-BRANCH>
$ git checkout -b <NAME-NEW-BRANCH>

Changing the base branch

If you started your work in the wrong base branch, or want to backport it, you can change the base branch using git rebase --onto, like this:

$ git rebase --onto <NEW-BASE-BRANCH> <OLD-BASE-BRANCH> <YOUR-BRANCH>

For example, backporting my_branch from master to 5.x:

$ git rebase --onto 5.x master my_branch

Making contributions that depend on pull requests in spyder-kernels

Spyder and spyder-kernels are developed jointly because a lot of communication happens between them in order to run code written in the editor in the IPython console. The way the branches on their respective repos are linked appears in the table below:

Spyder branch Associated spyder-kernels branch
5.x 2.x
master (future 6.x) master (future 3.x)

For this reason, a clone of spyder-kernels is placed in the external-deps subfolder of the Spyder repository. The instructions on this section will help you in case you need to make changes that touch both repositories at the same time.

The first thing you need to do is cloning the git-subrepo project and follow these instructions to install it (on Windows you need to use Git Bash in order to run them):

git clone https://github.com/ingydotnet/git-subrepo /path/to/git-subrepo
echo 'source /path/to/git-subrepo/.rc' >> ~/.bashrc
source ~/.bashrc

As an example, let's assume that (i) your Github user name is myuser; (ii) you have two git repositories placed at ~/spyder and ~/spyder-kernels that link to https://github.com/myuser/spyder and https://github.com/myuser/spyder-kernels respectively; and (iii) you have two branches named fix_in_spyder and fix_in_kernel in each of these git repos respectively. If you want to open a joint PR in spyder and spyder-kernels that link these branches, here is how to do it:

  • Go to the ~/spyder folder, checkout your fix_in_spyder branch and replace the spyder-kernels clone in the external-deps subfolder by a clone of your fix_in_kernel branch:

    $ cd ~/spyder
    $ git checkout fix_in_spyder
    $ git subrepo pull external-deps/spyder-kernels -r https://github.com/myuser/spyder-kernels.git -b fix_in_kernel -u -f
    
  • You can now open a PR on https://github.com/spyder-ide/spyder and on https://github.com/spyder-ide/spyder-kernels for each of your branches.

  • If you make additional changes to the fix_in_kernel branch in spyder-kernels (e.g. adding a new file, as in the example below), you need to sync them in your Spyder's fix_in_spyder branch like this:

    $ cd ~/spyder-kernels
    $ git checkout fix_in_kernel
    $ touch foo.py
    $ git add -A
    $ git commit -m "Adding foo.py to the repo"
    $ git push origin fix_in_kernel
    
    $ cd ~/spyder
    $ git checkout fix_in_spyder
    $ git subrepo pull external-deps/spyder-kernels -r https://github.com/myuser/spyder-kernels.git -b fix_in_kernel -u -f
    $ git push origin fix_in_spyder
    
  • When your fix_in_kernel PR is merged, you need to update Spyder's fix_in_spyder branch because the clone in Spyder's repo must point out again to the spyder-kernel's repo and not to your own clone. For that, please run:

    $ git subrepo pull external-deps/spyder-kernels -r https://github.com/spyder-ide/spyder-kernels.git -b <branch> -u -f
    

where <branch> needs to be 2.x if your fix_in_spyder branch was done against Spyder's 5.x branch; and master, if you did it against our master branch here.

Making contributions that depend on pull requests in python-lsp-server or qtconsole

As with spyder-kernels, Spyder is tightly integrated with the python-lsp-server to provide code completion, linting and folding on its editor; and qtconsole for its IPython console.

Due to that, a clone of those projects is placed in the external-deps directory, which is managed with the git subrepo project. If you want to make a pull request in python-lsp-server or qtconsole that affects functionality in Spyder, please read carefully the instructions in the previous section because they are very similar for those cases. A summary of those instructions applied to these projects is the following:

  • First you need to create a pull request in python-lsp-server or qtconsole with the changes you want to make there. Let's assume the branch from which that pull request is created is called fix_in_external_dep.

  • Then you need to create a branch in Spyder (let's call it fix_in_spyder) with the fixes that require that pull request and update the python-lsp-server subrepo. For that you need to execute the following commands:

    $ git checkout -b fix_in_spyder
    $ git subrepo pull external-deps/python-lsp-server -r https://github.com/myuser/python-lsp-server.git -b fix_in_external_dep -u -f
    

    in case the fix is in python-lsp-server, or

    $ git checkout -b fix_in_spyder
    $ git subrepo pull external-deps/qtconsole -r https://github.com/myuser/qtconsole.git -b fix_in_external_dep -u -f
    

    if the fix is in qtconsole. And then commit the changes you need to make in Spyder.

  • If you need to add more commits to fix_in_external_dep, you need to update fix_in_spyder with these commands:

    $ git checkout fix_in_spyder
    $ git subrepo pull external-deps/python-lsp-server -r https://github.com/myuser/python-lsp-server.git -b fix_in_external_dep -u -f
    $ git push origin fix_in_spyder
    

    or

    $ git checkout fix_in_spyder
    $ git subrepo pull external-deps/qtconsole -r https://github.com/myuser/qtconsole.git -b fix_in_external_dep -u -f
    $ git push origin fix_in_spyder
    
  • After fix_in_external_dep is merged, you need to update the python-lsp-server or qtconsole subrepos in your fix_in_spyder branch with

    $ git checkout fix_in_spyder
    $ git subrepo pull external-deps/python-lsp-server -r https://github.com/python-lsp/python-lsp-server.git -b develop -u -f
    

    or

    $ git checkout fix_in_spyder
    $ git subrepo pull external-deps/qtconsole -r https://github.com/jupyter/qtconsole.git -b master -u -f
    

Adding Third-Party Content

All files or groups of files, including source code, images, icons, and other assets, that originate from projects outside of the Spyder organization (regardless of the license), must be first approved by the Spyder team. Always check with us (on Github, Gitter, Google Group, etc) before attempting to add content from an external project, and only do so when necessary.

Licenses

Code considered for inclusion must be under a permissive (i.e. non-copyleft) license, particularly as the following (in order of preference):

  • MIT (Expat)
  • Public domain (preferably, CC0)
  • ISC license
  • BSD 2-clause ("Simplified BSD")
  • BSD 3-clause ("New" or "Modified BSD")
  • Apache License 2.0

Additionally, external assets (fonts, icons, images, sounds, animations) can generally be under one of the following weak-copyleft and content licenses:

  • Creative Commons Attribution 3.0 or 4.0
  • SIL Open Font License 1.1
  • GNU LGPL 2.1 or 3.0

Additional licenses may qualify for these lists from time to time, but every effort should be made to avoid it. Regardless, all such licenses must be OSI, FSF, and DSFG approved as well as GPLv3-compatible to ensure maximum free distribution and use of Spyder with minimum ambiguity or fragmentation.

Steps to take

  1. Contact the Spyder team to ensure the usage is justified and compatible.

  2. Add the files, preserving any original copyright/legal/attribution header

  3. If making non-trivial modifications, copy the standard Spyder copyright header from .ciocopyright to just below the original headers; if the original headers are unformatted and just consist of a copyright statement and perhaps mention of the license, incorporate them verbatim within the Spyder header where appropriate. Always ensure copyright statements are in ascending chronological order, and replace the year in the Spyder copyright statement with the current one. Modify the license location to be the current directory, or NOTICE.txt.

  4. Include the following line at the end of each module's docstring, separated by blank lines:

    Adapted from path/to/file/in/original/repo.py of the
    `Project Name <url-to-original-github-repo>`_.

    For example,

    Adapted from qcrash/_dialogs/gh_login.py of the
    `QCrash Project <https://github.com/ColinDuquesnoy/QCrash>`_.
  5. Convert the files to project standards where needed.

  6. If the copied file(s) reside in a directory dedicated to them, place the source project's LICENSE.txt file there, and any other legal files. Also, mention the same in the init.py file in that directory.

  7. Add an entry in NOTICE.txt with the instructions and template there.

  8. If a non-code visible asset (icons, fonts, animations, etc) or otherwise under a Creative Commons license, include a mention in the appropriate section of the README, as well as Spyder's About dialog, in the same form as the others present there.

More information

Main Website

Download Spyder (with Anaconda)

Online Documentation

Spyder Github

Troubleshooting Guide and FAQ

Development Wiki

Gitter Chatroom

Google Group

@Spyder_IDE on Twitter

@SpyderIDE on Facebook

Support Spyder on OpenCollective