Skip to content

Add instructions on how to sign CLA using CLA-assistant. #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions committing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,13 @@ original check-in message in that case).

Finally, make sure that the submitter of the
patch has a CLA in place (indicated by an asterisk following their username
in the `issue tracker`_ or by the "CLA Signed" label on the pull request).
If the submitter lacks a signed CLA and the patch is non-trivial, direct them
to the electronic `Contributor Licensing Agreement`_
in the `issue tracker`_ or by the ``license/cla`` status check on the pull request).
If the submitter lacks a signed CLA, direct them to the `Contributor Licensing Agreement`_
to ensure the PSF has the appropriate authorizations in place to relicense
and redistribute their code.



Contributor Licensing Agreements
--------------------------------

Expand All @@ -128,18 +128,8 @@ for inclusion.


.. _Contribution: https://www.python.org/psf/contrib/
.. _Contributor Licensing Agreement:
https://www.python.org/psf/contrib/contrib-form/


Checking if the CLA has been received
-------------------------------------

To check if a contributor's CLA has been received, go to the following website::

https://check-python-cla.herokuapp.com/
.. _Contributor Licensing Agreement: https://psf-cla-assistant-staging.herokuapp.com/python/cpython

and put in their GitHub username.

For further questions about the CLA process, write to: [email protected].

Expand Down
46 changes: 30 additions & 16 deletions pullrequest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ You should have already :ref:`set up your system <setup>`,
You can still upload a patch to bugs.python.org_, but the GitHub pull request
workflow is **strongly** preferred.

.. _bugs.python.org: https://bugs.python.org

.. _good-prs:

Expand Down Expand Up @@ -243,30 +244,42 @@ license your code for use with Python (you retain the copyright).
You only have to sign this document once, it will then apply to all
your further contributions to Python.

Here are the steps needed in order to sign the CLA:
You can sign the CLA before or after you have created a pull request.

1. If you don't have an account on `bugs.python.org <https://bugs.python.org>`_
(aka b.p.o), please
`register <https://bugs.python.org/user?@template=register>`_ to create one.
To sign a CLA before you created a pull request:

2. Make sure your GitHub username is listed in the `"Your Details"
<https://cloud.githubusercontent.com/assets/2680980/23276970/d14a380c-f9d1-11e6-883d-e13b6b211239.png>`_
section at b.p.o.
1. Go to The PSF's instance of `CLA Assistant`_.

3. Fill out and sign the PSF `contributor form`_. The "bugs.python.org username"
requested by the form is the "Login name" field under "Your Details".
2. Sign in with the GitHub account that you will use to contribute to Python.

After signing the CLA, please **wait at least one US business day** and
then check the status by going to the `check-python-cla <https://check-python-cla.herokuapp.com>`_
website. The check will also be run automatically the next time you push changes
to your PR.
3. Read the CLA.

4. Enter your information in the form: Full name, address, and email address.
It should be the email address associated with your GitHub account.

5. Tick the "I have read and agree to the CLA" checkbox.

6. Press the "I agree" button.

To sign the CLA after you have created a pull request:

1. Click on the ``[CLA|not signed yet]`` button in the comment by ``psf-cla-assistant`` bot.

2. Sign in with the GitHub account used to create the pull request.

3. Read the CLA.

4. Enter your information in the form: Full name, address, and email address.
It should be the email address associated with your GitHub account.

5. Tick the "I have read and agree to the CLA" checkbox.

6. Press the "I agree" button.

.. _PSF license: https://docs.python.org/dev/license.html#terms-and-conditions-for-accessing-or-otherwise-using-python
.. _contributor agreement: https://www.python.org/psf/contrib/
.. _contributor form: https://www.python.org/psf/contrib/contrib-form/
.. _contributor agreement: https://psf-cla-assistant-staging.herokuapp.com/python/cpython
.. _Python Software Foundation: https://www.python.org/psf/

.. _CLA Assistant: https://psf-cla-assistant-staging.herokuapp.com/python/cpython

Submitting
----------
Expand Down Expand Up @@ -441,3 +454,4 @@ Non-trivial contributions are credited in the ``Misc/ACKS`` file (and, most
often, in a contribution's news entry as well). You may be
asked to make these edits on the behalf of the core developer who
accepts your pull request.