From 056a2a5a21027bca0b0c30c15f5e9aae8aeca95a Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 22 Dec 2023 12:09:42 +0000 Subject: [PATCH 1/3] Changes in preparation for SciTools CLA v5. --- .github/CONTRIBUTING.md | 6 +++--- .github/PULL_REQUEST_TEMPLATE.md | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a3417deeb..97eee787f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -23,9 +23,9 @@ Getting started Submitting changes ------------------ -1. Read and sign the Contributor Licence Agreement (CLA) if you have not already done so. - - See the [governance page](http://scitools.org.uk/governance.html) - for the CLA and what to do with it. 1. Push your branch to your fork of cartopy. 1. Submit your pull request. +1. Note that you will automatically be asked to sign the + [Contributor Licence Agreement](https://cla-assistant.io/SciTools-incubator/) + (CLA), if you have not already done so. 1. Sit back and wait for the core Cartopy development team to review your code. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2e4e46d4b..564676ec1 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -23,12 +23,13 @@ request could be broken into smaller parts before submitting. From 48a210ed37f1c7010a9bafd76423bdcf24b2ce31 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 22 Dec 2023 12:35:13 +0000 Subject: [PATCH 2/3] Remove temporary reference to SciTools-incubator. --- .github/CONTRIBUTING.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 97eee787f..180b53366 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -26,6 +26,6 @@ Submitting changes 1. Push your branch to your fork of cartopy. 1. Submit your pull request. 1. Note that you will automatically be asked to sign the - [Contributor Licence Agreement](https://cla-assistant.io/SciTools-incubator/) + [Contributor Licence Agreement](https://cla-assistant.io/SciTools/) (CLA), if you have not already done so. 1. Sit back and wait for the core Cartopy development team to review your code. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 564676ec1..435297b98 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -29,7 +29,7 @@ request could be broken into smaller parts before submitting. * Ensure there is a suitable item in the cartopy test suite for the change you are proposing. * Note that you will automatically be asked to sign the - [Contributor Licence Agreement](https://cla-assistant.io/SciTools-incubator/) + [Contributor Licence Agreement](https://cla-assistant.io/SciTools/) (CLA), if you have not already done so. --> From 5ac74686ff8a96c4aafc440a7ad951b9036f9ffd Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 13:01:36 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/CONTRIBUTING.md | 4 ++-- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 180b53366..8000753cd 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -25,7 +25,7 @@ Submitting changes 1. Push your branch to your fork of cartopy. 1. Submit your pull request. -1. Note that you will automatically be asked to sign the +1. Note that you will automatically be asked to sign the [Contributor Licence Agreement](https://cla-assistant.io/SciTools/) - (CLA), if you have not already done so. + (CLA), if you have not already done so. 1. Sit back and wait for the core Cartopy development team to review your code. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 435297b98..8ff575eaa 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -28,8 +28,8 @@ request could be broken into smaller parts before submitting. * Ensure there is a suitable item in the cartopy test suite for the change you are proposing. - * Note that you will automatically be asked to sign the + * Note that you will automatically be asked to sign the [Contributor Licence Agreement](https://cla-assistant.io/SciTools/) - (CLA), if you have not already done so. + (CLA), if you have not already done so. -->