From e0b1cbad8701a451861ea5c1ac4da646e04614e4 Mon Sep 17 00:00:00 2001 From: Nico Matentzoglu Date: Mon, 5 Feb 2024 12:33:44 +0200 Subject: [PATCH 01/14] Create pull_request_template.md Fixes #361. --- .github/pull_request_template.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000..9b631412 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,14 @@ +Resolves #ISSUE + +- [ ] `docs/` have been added/updated +- [ ] `sh run.sh make build-mondo-ingest` has been run on this branch(after `docker pull obolibrary/odkfull:dev), and no errors occurred. + +High-level description. This PR: + +- One +- Two +- Three + +### Note: + +**No (!) PRs should be merged without at least one review from a different team member of the Mondo Technical team.** From 5341ee7a1adf152f5dfb7a6bfee6c22fafa8558c Mon Sep 17 00:00:00 2001 From: Nico Matentzoglu Date: Mon, 5 Feb 2024 12:38:38 +0200 Subject: [PATCH 02/14] Update pull_request_template.md --- .github/pull_request_template.md | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 9b631412..1ec068e3 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,14 +1,21 @@ -Resolves #ISSUE +Resolves #ISSUE. -- [ ] `docs/` have been added/updated -- [ ] `sh run.sh make build-mondo-ingest` has been run on this branch(after `docker pull obolibrary/odkfull:dev), and no errors occurred. +**No (!) PRs should be merged without at least one review from a different team member of the Mondo Technical team.** + +## Documentation + +- [ ] `docs/` have been added/updated **OR** +- [ ] No updates to the docs is considered unnecessary after careful consideration. + +## QC + +- [ ] `sh run.sh make build-mondo-ingest` has been run on this branch (after `docker pull obolibrary/odkfull:dev), and no errors occurred **OR** +- [ ] No functional (code-related) changes to the pipeline are suggested, so no re-run is necessary. -High-level description. This PR: +## High-level description + +This PR: - One - Two - Three - -### Note: - -**No (!) PRs should be merged without at least one review from a different team member of the Mondo Technical team.** From 4d75295bf4230447505662887c9f1482519b3703 Mon Sep 17 00:00:00 2001 From: Nico Matentzoglu Date: Tue, 6 Feb 2024 12:39:42 +0200 Subject: [PATCH 03/14] Update .github/pull_request_template.md Co-authored-by: Joe Flack --- .github/pull_request_template.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1ec068e3..35130ad8 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -3,6 +3,7 @@ Resolves #ISSUE. **No (!) PRs should be merged without at least one review from a different team member of the Mondo Technical team.** ## Documentation + - [ ] `docs/` have been added/updated **OR** - [ ] No updates to the docs is considered unnecessary after careful consideration. From 45287343559557dc4a57347bff15ac00c61d854e Mon Sep 17 00:00:00 2001 From: Nico Matentzoglu Date: Tue, 6 Feb 2024 12:41:39 +0200 Subject: [PATCH 04/14] Update .github/pull_request_template.md Co-authored-by: Joe Flack --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 35130ad8..e5f41412 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,7 +2,7 @@ Resolves #ISSUE. **No (!) PRs should be merged without at least one review from a different team member of the Mondo Technical team.** -## Documentation +## Pre-merge checklist - [ ] `docs/` have been added/updated **OR** From e3fbcdbd05f2a14a12df84f3248164ad60e8caac Mon Sep 17 00:00:00 2001 From: Nico Matentzoglu Date: Tue, 6 Feb 2024 12:45:43 +0200 Subject: [PATCH 05/14] Update pull_request_template.md --- .github/pull_request_template.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index e5f41412..4d01a6c0 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -3,15 +3,19 @@ Resolves #ISSUE. **No (!) PRs should be merged without at least one review from a different team member of the Mondo Technical team.** ## Pre-merge checklist + -- [ ] `docs/` have been added/updated **OR** -- [ ] No updates to the docs is considered unnecessary after careful consideration. +- [ ] Docs + - `docs/` have been added/updated **OR** + - No updates to the docs necessary after careful consideration. -## QC +- [ ] QC + - `sh run.sh make build-mondo-ingest` has been run on this branch (after `docker pull obolibrary/odkfull:dev), and no errors occurred **OR** + - No functional (code-related) changes to the pipeline are suggested, so no re-run is necessary. -- [ ] `sh run.sh make build-mondo-ingest` has been run on this branch (after `docker pull obolibrary/odkfull:dev), and no errors occurred **OR** -- [ ] No functional (code-related) changes to the pipeline are suggested, so no re-run is necessary. +- [ ] Reviewed + - Has been sufficiently reviewed by at least one review from a different team member of the Mondo Technical team. ## High-level description From 6f1ebf47220f83cfcd8ef081b4095440b8aa8f43 Mon Sep 17 00:00:00 2001 From: Nico Matentzoglu Date: Tue, 6 Feb 2024 12:46:10 +0200 Subject: [PATCH 06/14] Update .github/pull_request_template.md --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 4d01a6c0..d4e7d99e 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,4 +1,4 @@ -Resolves #ISSUE. +Fixes #ISSUE. **No (!) PRs should be merged without at least one review from a different team member of the Mondo Technical team.** From 94fe6cbf2a785adf4e79807eb4fa1bc1fc004423 Mon Sep 17 00:00:00 2001 From: Nico Matentzoglu Date: Tue, 6 Feb 2024 12:47:14 +0200 Subject: [PATCH 07/14] Update .github/pull_request_template.md --- .github/pull_request_template.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d4e7d99e..ff079481 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,6 +1,5 @@ Fixes #ISSUE. -**No (!) PRs should be merged without at least one review from a different team member of the Mondo Technical team.** ## Pre-merge checklist From f18e0e527f2e3e1b7a12828e066df9825bea587a Mon Sep 17 00:00:00 2001 From: Nico Matentzoglu Date: Wed, 7 Feb 2024 12:42:45 +0200 Subject: [PATCH 08/14] Update .github/pull_request_template.md Co-authored-by: Joe Flack --- .github/pull_request_template.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ff079481..93a1d131 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -13,6 +13,9 @@ Fixes #ISSUE. - `sh run.sh make build-mondo-ingest` has been run on this branch (after `docker pull obolibrary/odkfull:dev), and no errors occurred **OR** - No functional (code-related) changes to the pipeline are suggested, so no re-run is necessary. +- [ ] Account for any new packages + - Open an [ODK issue](https://github.com/INCATools/ontology-development-kit/issues/new) to request addition. Can also open a PR. Python package changes should occur in [[requirements.txt.full](https://github.com/INCATools/ontology-development-kit/blob/master/requirements.txt.full)](https://github.com/INCATools/ontology-development-kit/blob/master/requirements.txt.full), and non-Python packages in [Dockerfile](https://github.com/INCATools/ontology-development-kit/blob/master/Dockerfile). + - [ ] Reviewed - Has been sufficiently reviewed by at least one review from a different team member of the Mondo Technical team. From 138d4b8c3a815349ef6f8472817619572cf5ac8b Mon Sep 17 00:00:00 2001 From: Nico Matentzoglu Date: Wed, 7 Feb 2024 12:45:16 +0200 Subject: [PATCH 09/14] Update .github/pull_request_template.md Co-authored-by: Joe Flack --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 93a1d131..2902f9ea 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -19,7 +19,7 @@ Fixes #ISSUE. - [ ] Reviewed - Has been sufficiently reviewed by at least one review from a different team member of the Mondo Technical team. -## High-level description +## Overview This PR: From ee25143d66f136d00db725a9673117e7d32f69c0 Mon Sep 17 00:00:00 2001 From: Nico Matentzoglu Date: Wed, 7 Feb 2024 12:47:11 +0200 Subject: [PATCH 10/14] Update .github/pull_request_template.md Co-authored-by: Joe Flack --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 2902f9ea..ed93b318 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -3,7 +3,7 @@ Fixes #ISSUE. ## Pre-merge checklist - + - [ ] Docs - `docs/` have been added/updated **OR** From d21ecd48102e6316ce151a5f1dce4ec3f90b4a4a Mon Sep 17 00:00:00 2001 From: Nico Matentzoglu Date: Thu, 8 Feb 2024 12:45:21 +0200 Subject: [PATCH 11/14] Update .github/pull_request_template.md Co-authored-by: Joe Flack --- .github/pull_request_template.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ed93b318..c5abab0c 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,4 +1,12 @@ -Fixes #ISSUE. +Resolves #ISSUE(s). + ## Pre-merge checklist From 74a00375917e59d5dd17aa5010cc096be8ab49d0 Mon Sep 17 00:00:00 2001 From: Nico Matentzoglu Date: Fri, 9 Feb 2024 17:37:25 +0200 Subject: [PATCH 12/14] Update .github/pull_request_template.md Co-authored-by: Joe Flack --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index c5abab0c..a3d8c38e 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -22,7 +22,7 @@ Addresses sub-task (n) in: - No functional (code-related) changes to the pipeline are suggested, so no re-run is necessary. - [ ] Account for any new packages - - Open an [ODK issue](https://github.com/INCATools/ontology-development-kit/issues/new) to request addition. Can also open a PR. Python package changes should occur in [[requirements.txt.full](https://github.com/INCATools/ontology-development-kit/blob/master/requirements.txt.full)](https://github.com/INCATools/ontology-development-kit/blob/master/requirements.txt.full), and non-Python packages in [Dockerfile](https://github.com/INCATools/ontology-development-kit/blob/master/Dockerfile). + - Open an [ODK issue](https://github.com/INCATools/ontology-development-kit/issues/new) to request addition. Can also open a PR. Python package changes should occur in [requirements.txt.full](https://github.com/INCATools/ontology-development-kit/blob/master/requirements.txt.full), and non-Python packages in [Dockerfile](https://github.com/INCATools/ontology-development-kit/blob/master/Dockerfile). - [ ] Reviewed - Has been sufficiently reviewed by at least one review from a different team member of the Mondo Technical team. From f81f6117d054ee2580d448fd2939f54d45174625 Mon Sep 17 00:00:00 2001 From: Nico Matentzoglu Date: Fri, 9 Feb 2024 17:40:27 +0200 Subject: [PATCH 13/14] Update .github/pull_request_template.md Co-authored-by: Joe Flack --- .github/pull_request_template.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index a3d8c38e..4d364b39 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -28,6 +28,7 @@ Addresses sub-task (n) in: - Has been sufficiently reviewed by at least one review from a different team member of the Mondo Technical team. ## Overview + This PR: From 45118230e2380504454d89073b64bec5c021f929 Mon Sep 17 00:00:00 2001 From: Trish Whetzel <2167174+twhetzel@users.noreply.github.com> Date: Wed, 21 Feb 2024 21:24:18 -0800 Subject: [PATCH 14/14] reformat info --- .github/pull_request_template.md | 44 ++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 4d364b39..9681954d 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -13,25 +13,35 @@ Addresses sub-task (n) in: -- [ ] Docs - - `docs/` have been added/updated **OR** - - No updates to the docs necessary after careful consideration. - -- [ ] QC - - `sh run.sh make build-mondo-ingest` has been run on this branch (after `docker pull obolibrary/odkfull:dev), and no errors occurred **OR** - - No functional (code-related) changes to the pipeline are suggested, so no re-run is necessary. - -- [ ] Account for any new packages - - Open an [ODK issue](https://github.com/INCATools/ontology-development-kit/issues/new) to request addition. Can also open a PR. Python package changes should occur in [requirements.txt.full](https://github.com/INCATools/ontology-development-kit/blob/master/requirements.txt.full), and non-Python packages in [Dockerfile](https://github.com/INCATools/ontology-development-kit/blob/master/Dockerfile). - -- [ ] Reviewed - - Has been sufficiently reviewed by at least one review from a different team member of the Mondo Technical team. - -## Overview - +### PR Overview + This PR: - - One - Two - Three + +===================== +### Documentation +- Was the documentation added/updated under `docs/`? + - [ ] Yes + - [ ] No, updates to the docs were not necessary after careful consideration + +### QC +- Was the full pipeline run before submitting this PR using `sh run.sh make build-mondo-ingest` on this branch (after `docker pull obolibrary/odkfull:dev`), and no errors occurred? + - [ ] Yes + - [ ] No, there are no functional (code-related) changes to the pipeline in the PR, so no re-run is necessary + +### New Packages +- Were any new *Python packages* added? + - [ ] Yes, [requirements.txt.full](https://github.com/INCATools/ontology-development-kit/blob/master/requirements.txt.full) was updated and an [ODK issue](https://github.com/INCATools/ontology-development-kit/issues/new) submitted + - [ ] No +
+ +- Were any other *non-Python packages* added? + - [ ] Yes, [Dockerfile](https://github.com/INCATools/ontology-development-kit/blob/master/Dockerfile) updated and an [ODK issue](https://github.com/INCATools/ontology-development-kit/issues/new) submitted + - [ ] No + +### PR Review and Conversations Resolved +- Has the PR been sufficiently reviewed by at least one team member of the Mondo Technical team and all threads resolved? + - [ ] Yes