From ed7e0839311a8a617fd3173d8ff8beffff417c44 Mon Sep 17 00:00:00 2001
From: "David J. Kalbfleisch" <1.21e9W@protonmail.com>
Date: Fri, 6 Sep 2024 16:50:28 -0400
Subject: [PATCH] #163 Update dependencies and Github templates.

---
 .github/ISSUE_TEMPLATE/bug-report-template.md |  5 ++---
 .github/ISSUE_TEMPLATE/story-template.md      |  7 ++++---
 .github/pull_request_template.md              | 13 +------------
 notifications_utils/version.py                |  2 +-
 requirements_for_test.txt                     |  6 +++---
 scripts/run_tests.sh                          |  4 ++--
 setup.py                                      |  2 +-
 7 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-report-template.md b/.github/ISSUE_TEMPLATE/bug-report-template.md
index 487e8f29..ee7ad067 100644
--- a/.github/ISSUE_TEMPLATE/bug-report-template.md
+++ b/.github/ISSUE_TEMPLATE/bug-report-template.md
@@ -15,6 +15,7 @@ We do not need what to write showing up in tickets though, so please do not unco
 ## Description
 
 - [ ] Ticket is understood, and QA has been contacted (if the ticket has a QA label).
+- [ ] This work is added to the sprint review slide deck (key win bullet point and demo slide)
 
 <!--_**Required.** Describe the problem._-->
 
@@ -36,10 +37,8 @@ Is there something we can do to work around this issue in the meantime?
 
 - [ ] 
 
-<!--
 ## QA Considerations
-_Populate with suggested QA actions if applicable. Leave blank if QA is not applicable on this ticket._
--->
+<!-- Populate with suggested QA actions if applicable. Leave blank if QA is not applicable on this ticket. -->
 
 ## Additional Info & Resources
 <!--Always attempt to include additional information.  This could include screenshots, log snippets, links to applicable code files, and/or articles/websites that have relevant info on the issue. Leave blank if n/a.-->
diff --git a/.github/ISSUE_TEMPLATE/story-template.md b/.github/ISSUE_TEMPLATE/story-template.md
index cddd1e0d..2f8cf0fc 100644
--- a/.github/ISSUE_TEMPLATE/story-template.md
+++ b/.github/ISSUE_TEMPLATE/story-template.md
@@ -35,10 +35,11 @@ We do not need what to write showing up in tickets though, so please do not unco
 <!--_**Required**_
 - e.g. when I send an email using an identifier, we retrieve the user’s email address in VA Profile and successfully deliver the email to that recipient-->
 
-<!--
+- [ ] This work is added to the sprint review slide deck (key win bullet point and demo slide)
+
+
 ## QA Considerations
-_Populate with suggested QA actions if applicable. Leave blank if QA is not applicable on this ticket._
--->
+<!-- Populate with suggested QA actions if applicable. Leave blank if QA is not applicable on this ticket. -->
 
 <!--
 ## Potential Dependencies
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index ee53b91b..e560e360 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -9,16 +9,6 @@ Please include a summary of the change and which issue is fixed. Please also inc
 
 issue #(issue)
 
-## Type of change
-
-Please check the relevant option(s).
-
-- [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] Hotfix (quick fix for an urgent bug or issue)
-- [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
-- [ ] This change requires a documentation update
-- [ ] Documentation changes only
 
 ## How Has This Been Tested?
 <!--
@@ -45,5 +35,4 @@ Please provide relevant information and / or links to demonstrate the functional
 - [ ] I have ensured the latest main is merged into my branch and all checks are green prior to review
 - [ ] New and existing unit tests pass locally with my changes
 - [ ] Any dependent changes have been merged and published in downstream modules
-- [ ] The ticket is now moved into the DEV test column
-- [ ] I have added a bullet for this work to the Engineering Key Wins slide for review
+- [ ] The ticket was moved into the DEV test column when I began testing this change
diff --git a/notifications_utils/version.py b/notifications_utils/version.py
index f1edb192..05633ca0 100644
--- a/notifications_utils/version.py
+++ b/notifications_utils/version.py
@@ -1 +1 @@
-__version__ = '2.2.2'
+__version__ = '2.2.3'
diff --git a/requirements_for_test.txt b/requirements_for_test.txt
index 6169938d..d81b1199 100644
--- a/requirements_for_test.txt
+++ b/requirements_for_test.txt
@@ -3,8 +3,8 @@
 flake8~=5.0.4
 flake8-print~=5.0.0
 freezegun~=1.2.2
-pytest~=7.1.2
+pytest~=8.3.2
 pytest-cov~=3.0.0
-pytest-mock~=3.8.2
+pytest-mock~=3.14.0
 pytest-xdist~=2.5.0
-requests-mock~=1.9.3
+requests-mock~=1.12.1
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
index c4792316..16c067b5 100755
--- a/scripts/run_tests.sh
+++ b/scripts/run_tests.sh
@@ -26,10 +26,10 @@ flake8 --config .flake8 .
 display_result $? 1 "Code style check"
 
 ## Code coverage
-#py.test --cov=client tests/
+#pytest --cov=client tests/
 #display_result $? 2 "Code coverage"
 
-py.test -n4 tests/
+pytest -n4 tests/
 display_result $? 3 "Unit tests"
 
 python setup.py sdist
diff --git a/setup.py b/setup.py
index cf54731c..a5a2b222 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@
         'pypdf >= 3.15.0',
         'python-json-logger~=2.0.7',
         'pytz>=2021.3',
-        'pyyaml==6.0.1',
+        'pyyaml==6.0.2',
         'requests>=2.26.0',
         'smartypants>=2.0.1',
         'statsd>=3.3.0'