Merge pull request #980 from GSA/main

Production deploy 5/10/2024

app/config_files/templates.json

@@ -20,13 +20,14 @@
       "Notify.gov makes it easy to keep people updated by helping you send text messages.",
       "",
       "",
-      "Click this link to create an account on Notify.gov:",
-      "",
       "[Join Service](((url)))",
       "If you’re new to Notify.gov you will first be directed to Login.gov create an account with us.",
       "",
       "",
-      "This invitation will stop working at midnight tomorrow. This is to keep ((service_name)) secure."
+      "This invitation will stop working at midnight tomorrow. This is to keep ((service_name)) secure.",
+      "",
+      "",
+      "Notify.gov uses Login.gov to allow you to sign in safely. Login.gov is a secure sign in service to help you access participating government agencies' digital touchpoints."
     ]
   },
   {

pyproject.toml

@@ -4,7 +4,6 @@ version = "0.1.0"
 description = "Notify.gov backend"
 authors = ["Your Name <you@example.com>"]
 readme = "README.md"
-package-mode = false
 
 
 [tool.poetry.dependencies]
@@ -12,8 +11,8 @@ python = "^3.12.2"
 alembic = "==1.13.1"
 amqp = "==5.2.0"
 beautifulsoup4 = "==4.12.3"
-boto3 = "^1.29.6"
+boto3 = "^1.34.101"
-botocore = "^1.32.6"
+botocore = "^1.34.101"
 cachetools = "==5.3.3"
 celery = {version = "==5.3.6", extras = ["redis"]}
 certifi = ">=2022.12.7"
@@ -21,37 +20,36 @@ cffi = "==1.16.0"
 charset-normalizer = "^3.1.0"
 click = "==8.1.7"
 click-datetime = "==0.2"
-click-didyoumean = "==0.3.0"
+click-didyoumean = "==0.3.1"
 click-plugins = "==1.1.1"
 click-repl = "==0.3.0"
 deprecated = "==1.2.14"
 eventlet = "==0.36.1"
 expiringdict = "==1.2.2"
-flask = "~=2.3"
+flask = "~=3.0"
 flask-bcrypt = "==1.0.1"
-flask-marshmallow = "==0.14.0"
+flask-marshmallow = "==1.2.1"
 flask-migrate = "==4.0.7"
 flask-redis = "==0.4.0"
 flask-sqlalchemy = "==3.0.5"
 gunicorn = {version = "==22.0.0", extras = ["eventlet"]}
 iso8601 = "==2.1.0"
-jsonschema = {version = "==4.20.0", extras = ["format"]}
+jsonschema = {version = "==4.22.0", extras = ["format"]}
 lxml = "==5.2.1"
-marshmallow = "==3.20.2"
+marshmallow = "==3.21.2"
-marshmallow-sqlalchemy = "==0.30.0"
+marshmallow-sqlalchemy = "==1.0.0"
 newrelic = "*"
 notifications-python-client = "==9.0.0"
 notifications-utils = {git = "https://github.com/GSA/notifications-utils.git"}
 oscrypto = "==1.3.0"
-packaging = "==23.2"
+packaging = "==24.0"
 poetry-dotenv-plugin = "==0.2.0"
 psycopg2-binary = "==2.9.9"
 pyjwt = "==2.8.0"
-python-dotenv = "==1.0.0"
+python-dotenv = "==1.0.1"
 sqlalchemy = "==1.4.40"
-werkzeug = "^3.0.2"
+werkzeug = "^3.0.3"
-faker = "^24.4.0"
+faker = "^25.1.0"
-setuptools = "^69.2.0"
 
 
 [tool.poetry.group.dev.dependencies]
@@ -59,20 +57,20 @@ awscli = "^1.29.74"
 bandit = "*"
 black = "^24.3.0"
 cloudfoundry-client = "*"
-exceptiongroup = "==1.2.0"
+exceptiongroup = "==1.2.1"
 flake8 = "^7.0.0"
 flake8-bugbear = "^24.1.17"
 freezegun = "^1.4.0"
 honcho = "*"
 isort = "^5.13.2"
 jinja2-cli = {version = "==0.8.2", extras = ["yaml"]}
-moto = "==5.0.5"
+moto = "==5.0.6"
 pip-audit = "*"
 pre-commit = "^3.6.0"
-pytest = "^7.4.4"
+pytest = "^8.1.1"
 pytest-env = "^1.1.3"
-pytest-mock = "^3.12.0"
+pytest-mock = "^3.14.0"
-pytest-cov = "^4.1.0"
+pytest-cov = "^5.0.0"
 pytest-xdist = "^3.5.0"
 radon = "^6.0.1"
 requests-mock = "^1.11.0"

tests/app/template_folder/test_template_folder_rest.py

@@ -237,7 +237,7 @@ def test_update_template_folder_users(admin_request, sample_service):
     [
         ({}, "name is a required property"),
         ({"name": None}, "name None is not of type string"),
-        ({"name": ""}, "name  is too short"),
+        ({"name": ""}, "name  should be non-empty"),
     ],
 )
 def test_update_template_folder_fails_if_missing_name(

tests/app/webauthn/test_rest.py

@@ -89,7 +89,7 @@ def test_create_webauthn_credential_returns_201(admin_request, sample_user):
             "name None is not of type string",
         ),
         # name is empty
-        ({"name": "", "credential_data": "ABC123"}, "name  is too short"),
+        ({"name": "", "credential_data": "ABC123"}, "name  should be non-empty"),
     ],
 )
 def test_create_webauthn_credential_errors_if_schema_violation(
@@ -131,7 +131,7 @@ def test_update_webauthn_credential_returns_200(admin_request, sample_user):
         # name is null
         ({"name": None}, "name None is not of type string"),
         # name is empty
-        ({"name": ""}, "name  is too short"),
+        ({"name": ""}, "name  should be non-empty"),
     ],
 )
 def test_update_webauthn_credential_errors_if_schema_violation(