From 0cbbbde3e833d5d5a82de5b042956c0450582b5d Mon Sep 17 00:00:00 2001 From: DimitrisJim Date: Sun, 19 Mar 2017 20:03:24 +0200 Subject: [PATCH 1/5] Add ni instructions to licencing --- index.rst | 5 +++++ pullrequest.rst | 27 +++++++++++++++++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/index.rst b/index.rst index 0998efa38..b691df059 100644 --- a/index.rst +++ b/index.rst @@ -60,6 +60,11 @@ patch: bpo-12345: Fix some bug in spam module +.. note:: + + First time contributors will need to sign the Contributor Licensing + Agreement (CLA) as described in the :ref:`Licensing ` section of + this guide. Quick Links ----------- diff --git a/pullrequest.rst b/pullrequest.rst index 303d31270..760f06568 100644 --- a/pullrequest.rst +++ b/pullrequest.rst @@ -98,21 +98,36 @@ Licensing --------- For non-trivial changes, we must have your formal approval for distributing -your work under the `PSF license`_. Therefore, you need to fill out a -`contributor form`_ which allows the `Python Software Foundation`_ to +your work under the `PSF license`_. Therefore, you need to sign a +`contributor agreement`_ which allows the `Python Software Foundation`_ to license your code for use with Python (you retain the copyright). .. note:: You only have to sign this document once, it will then apply to all your further contributions to Python. -You will also need to specify you GitHub username on the -`issue tracker`_ on the *Your Details* link found on the -homepage. +Here are the steps needed in order to sign the CLA: + +1. If you don't have an account on `bugs.python.org `_, + please `register `_ + to create one. + +2. Make sure your GitHub username is listed in the + `"Your Details" `_ + section at b.p.o. + +3. Sign the PSF `contributor form`_. The "bugs.python.org username" + requested by the form is the "Login name" field under "Your Details". + +After signing the CLA, please **wait at least one US business day** and +then check "Your Details" on `b.p.o `_ to see if your account has +been marked as having signed the CLA (the delay is due to a person having +to manually check your signed CLA). .. _PSF license: https://docs.python.org/dev/license.html#terms-and-conditions-for-accessing-or-otherwise-using-python -.. _contributor form: https://www.python.org/psf/contrib/ +.. _contributor agreement: https://www.python.org/psf/contrib/ +.. _contributor form: https://www.python.org/psf/contrib/contrib-form/ .. _Python Software Foundation: https://www.python.org/psf/ From f9f00a19f0b640bea14626247929508769672550 Mon Sep 17 00:00:00 2001 From: DimitrisJim Date: Sun, 19 Mar 2017 20:17:53 +0200 Subject: [PATCH 2/5] Tweak wording a bit --- pullrequest.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pullrequest.rst b/pullrequest.rst index 760f06568..4b6d36e2e 100644 --- a/pullrequest.rst +++ b/pullrequest.rst @@ -116,7 +116,7 @@ Here are the steps needed in order to sign the CLA: `"Your Details" `_ section at b.p.o. -3. Sign the PSF `contributor form`_. The "bugs.python.org username" +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". After signing the CLA, please **wait at least one US business day** and From 68a5880cedb022d6d728422d0e86cb8bd02ae27f Mon Sep 17 00:00:00 2001 From: DimitrisJim Date: Tue, 21 Mar 2017 15:19:45 +0200 Subject: [PATCH 3/5] Address comments --- pullrequest.rst | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pullrequest.rst b/pullrequest.rst index 4b6d36e2e..5daffe31b 100644 --- a/pullrequest.rst +++ b/pullrequest.rst @@ -108,8 +108,8 @@ license your code for use with Python (you retain the copyright). Here are the steps needed in order to sign the CLA: -1. If you don't have an account on `bugs.python.org `_, - please `register `_ +1. If you don't have an account on `bugs.python.org `_ + (a.k.a b.p.o), please `register `_ to create one. 2. Make sure your GitHub username is listed in the @@ -124,6 +124,12 @@ then check "Your Details" on `b.p.o `_ to see if your account has been marked as having signed the CLA (the delay is due to a person having to manually check your signed CLA). +If after submitting a PR the "CLA not signed" label is added, you will +need to verify that your signing of the CLA has been noted on your b.p.o +account. Once that is verified, you can either ask for the CLA check to +be run again or wait for it to be run automatically when you push +changes to your PR. + .. _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/ From c3f8eae5e77946a91b758face13e798404bc18a4 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Tue, 21 Mar 2017 10:25:17 -0700 Subject: [PATCH 4/5] Drop some periods --- pullrequest.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pullrequest.rst b/pullrequest.rst index 5daffe31b..d6a89aa29 100644 --- a/pullrequest.rst +++ b/pullrequest.rst @@ -109,7 +109,7 @@ license your code for use with Python (you retain the copyright). Here are the steps needed in order to sign the CLA: 1. If you don't have an account on `bugs.python.org `_ - (a.k.a b.p.o), please `register `_ + (aka b.p.o), please `register `_ to create one. 2. Make sure your GitHub username is listed in the From 967b781e1d6704778144b16d99abb38f8d8ce844 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Tue, 21 Mar 2017 10:27:41 -0700 Subject: [PATCH 5/5] Simplify a paragraph to a sentence --- pullrequest.rst | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pullrequest.rst b/pullrequest.rst index d6a89aa29..6be4f119a 100644 --- a/pullrequest.rst +++ b/pullrequest.rst @@ -122,13 +122,10 @@ Here are the steps needed in order to sign the CLA: After signing the CLA, please **wait at least one US business day** and then check "Your Details" on `b.p.o `_ to see if your account has been marked as having signed the CLA (the delay is due to a person having -to manually check your signed CLA). - -If after submitting a PR the "CLA not signed" label is added, you will -need to verify that your signing of the CLA has been noted on your b.p.o -account. Once that is verified, you can either ask for the CLA check to -be run again or wait for it to be run automatically when you push -changes to your PR. +to manually check your signed CLA). Once you have verified that your b.p.o +account reflects your signing of the CLA, you can either ask for the CLA check +to be run again or wait for it to be run automatically the next time you push +changes to your PR. .. _PSF license: https://docs.python.org/dev/license.html#terms-and-conditions-for-accessing-or-otherwise-using-python