diff --git a/src/Pipfile b/src/Pipfile index fdf127d7c..07b1db715 100644 --- a/src/Pipfile +++ b/src/Pipfile @@ -4,7 +4,7 @@ verify_ssl = true name = "pypi" [packages] -django = "4.2.10" +django = "4.2.17" cfenv = "*" django-cors-headers = "*" pycryptodomex = "*" diff --git a/src/Pipfile.lock b/src/Pipfile.lock index 33b858314..56daf5db5 100644 --- a/src/Pipfile.lock +++ b/src/Pipfile.lock @@ -1789,11 +1789,12 @@ }, "waitress": { "hashes": [ - "sha256:005da479b04134cdd9dd602d1ee7c49d79de0537610d653674cc6cbde222b8a1", - "sha256:2a06f242f4ba0cc563444ca3d1998959447477363a2d7e9b8b4d75d35cfd1669" + "sha256:26cdbc593093a15119351690752c99adc13cbc6786d75f7b6341d1234a3730ac", + "sha256:ef0c1f020d9f12a515c4ec65c07920a702613afcad1dbfdc3bcec256b6c072b3" ], - "markers": "python_full_version >= '3.8.0'", - "version": "==3.0.0" + "index": "pypi", + "markers": "python_full_version >= '3.9.0'", + "version": "==3.0.1" }, "webob": { "hashes": [ diff --git a/src/package.json b/src/package.json index e433d0126..7f7448bd2 100644 --- a/src/package.json +++ b/src/package.json @@ -22,5 +22,8 @@ "sass-loader": "^12.6.0", "webpack": "^5.96.1", "webpack-stream": "^7.0.0" + }, + "overrides": { + "semver": "^7.5.3" } } diff --git a/src/registrar/fixtures/fixtures_users.py b/src/registrar/fixtures/fixtures_users.py index a8cdb5b9a..e40998231 100644 --- a/src/registrar/fixtures/fixtures_users.py +++ b/src/registrar/fixtures/fixtures_users.py @@ -151,6 +151,27 @@ class UserFixture: "email": "skey@truss.works", "title": "Designer", }, + { + "username": "f20b7a53-f40d-48f8-8c12-f42f35eede92", + "first_name": "Kimberly", + "last_name": "Aralar", + "email": "kimberly.aralar@gsa.gov", + "title": "Designer", + }, + { + "username": "4aa78480-6272-42f9-ac29-a034ebdd9231", + "first_name": "Kaitlin", + "last_name": "Abbitt", + "email": "kaitlin.abbitt@cisa.dhs.gov", + "title": "Product Manager", + }, + { + "username": "5e54fd98-6c11-4cb3-82b6-93ed8be50a61", + "first_name": "Gina", + "last_name": "Summers", + "email": "gina.summers@ecstech.com", + "title": "Scrum Master", + }, ] STAFF = [ @@ -257,6 +278,18 @@ class UserFixture: "last_name": "Key-Analyst", "email": "skey+1@truss.works", }, + { + "username": "cf2b32fe-280d-4bc0-96c2-99eec09ba4da", + "first_name": "Kimberly-Analyst", + "last_name": "Aralar-Analyst", + "email": "kimberly.aralar+1@gsa.gov", + }, + { + "username": "80db923e-ac64-4128-9b6f-e54b2174a09b", + "first_name": "Kaitlin-Analyst", + "last_name": "Abbitt-Analyst", + "email": "kaitlin.abbitt@gwe.cisa.dhs.gov", + }, ] # Additional emails to add to the AllowedEmail whitelist. diff --git a/src/requirements.txt b/src/requirements.txt index 52c601b55..1a9282591 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -13,7 +13,7 @@ defusedxml==0.7.1; python_version >= '2.7' and python_version not in '3.0, 3.1, diff-match-patch==20230430; python_version >= '3.7' dj-database-url==2.2.0 dj-email-url==1.0.6 -django==4.2.10; python_version >= '3.8' +django==4.2.17; python_version >= '3.8' django-admin-multiple-choice-list-filter==0.1.1 django-allow-cidr==0.7.1 django-auditlog==3.0.0; python_version >= '3.8'