From 9c658bf0203a1d25fc62a597cb9aeffdf6359dc9 Mon Sep 17 00:00:00 2001 From: Andrew Shumway Date: Wed, 6 Dec 2023 12:26:33 -0700 Subject: [PATCH 01/22] Fix verbage on front end to better reflect functionality --- app/main/forms.py | 2 +- app/templates/views/service-settings.html | 10 +++++----- .../views/service-settings/set-message-limit.html | 4 ++-- .../views/service_settings/test_service_settings.py | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index fb9b7eeac..5e926dce4 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1196,7 +1196,7 @@ class AdminServiceSMSAllowanceForm(StripWhitespaceForm): class AdminServiceMessageLimitForm(StripWhitespaceForm): message_limit = GovukIntegerField( - "Number of messages the service is allowed to send each day", + "Max number of messages the service has per send", validators=[DataRequired(message="Cannot be empty")], ) diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index 9364880fc..c3e0803ab 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -93,7 +93,7 @@ ) }} {% endcall %} - + {% if current_user.platform_admin %} {% call settings_row(if_has_permission='sms') %} {{ text_field('Send international text messages') }} @@ -107,7 +107,7 @@ }} {% endcall %} {% endif %} - + + + {% if not notification %} + {% call field(align='right') %}{% endcall %} + {% else %} + + {% call field( + align='right' + ) %} +

+ {{ notification.carrier}} +

+ {% if displayed_on_single_line %}{% endif %} + {% endcall %} + {% endif %} +{% endmacro %} + +{% macro notification_carrier_message_field(notification) %} + + {% if not notification %} + {% call field(align='right') %}{% endcall %} + {% else %} + + {% call field( + status=status, + align='right' + ) %} +

+ {{notification.provider_response}} +

+ {% if displayed_on_single_line %}{% endif %} + {% endcall %} + {% endif %} +{% endmacro %} {% macro spark_bar_field( count, @@ -189,7 +225,7 @@ {% call field(align='right') %} - {{ '{:,.0f}'.format(count) }} + {{ '{:,.0f}'.format(count) }} -{% endblock %} \ No newline at end of file +{% endblock %} From 13d3ffd9143df7e1f1bb3cb12e88f00df143e863 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 12 Dec 2023 10:04:38 -0800 Subject: [PATCH 11/22] fixed typo --- app/templates/views/signedout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html index 5014623d6..f672bf626 100644 --- a/app/templates/views/signedout.html +++ b/app/templates/views/signedout.html @@ -17,7 +17,7 @@ Notify.gov

Reach people where they are with government-powered text messages

-

Notify.gov is a text message service that helps federal, state, local, tribal and territorial goverments more effectively communicate with the people who use their services.

+

Notify.gov is a text message service that helps federal, state, local, tribal and territorial governments more effectively communicate with the people who use their services.

Sign in if you are an existing pilot partner From 218359411d2be5f6aa1bd06b5512f5f6469777cc Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 12 Dec 2023 10:16:06 -0800 Subject: [PATCH 12/22] updated test --- tests/app/main/views/test_index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py index e9ea4dcf0..0b584962a 100644 --- a/tests/app/main/views/test_index.py +++ b/tests/app/main/views/test_index.py @@ -15,7 +15,7 @@ def test_non_logged_in_user_can_see_homepage( client_request.logout() page = client_request.get("main.index", _test_page_title=False) - assert page.h1.text.strip() == ("Send text messages to your participants") + assert page.h1.text.strip() == ("Reach people where they are with government-powered text messages") assert page.select_one("a.usa-button.usa-button--big")["href"] == url_for( "main.sign_in", From fea6e0a0d07088a6452d72f0da6443c7b7beae3e Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 12 Dec 2023 11:34:20 -0800 Subject: [PATCH 13/22] update content text --- app/templates/views/signedout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html index f672bf626..8c703d847 100644 --- a/app/templates/views/signedout.html +++ b/app/templates/views/signedout.html @@ -17,7 +17,7 @@ Notify.gov

Reach people where they are with government-powered text messages

-

Notify.gov is a text message service that helps federal, state, local, tribal and territorial governments more effectively communicate with the people who use their services.

+

Notify.gov is a text message service that helps federal, state, local, tribal and territorial governments more effectively communicate with the people they serve.

Sign in if you are an existing pilot partner From d35b490ee7e9fe448511890555c9174a69cb28d9 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Tue, 12 Dec 2023 15:39:16 -0500 Subject: [PATCH 14/22] Moved the button to a more obvious place on the page --- app/templates/views/manage-users.html | 27 +++++++++++------------ tests/app/main/views/test_manage_users.py | 12 ++++------ 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html index bd91a2f04..f8585870e 100644 --- a/app/templates/views/manage-users.html +++ b/app/templates/views/manage-users.html @@ -9,9 +9,19 @@ {% block maincolumn_content %} -

- Team members -

+
+

+ Team members +

+ {% if current_user.has_permissions('manage_service') %} + {{ usaButton({ + "element": "a", + "text": "Invite a team member", + "href": url_for('.invite_user', service_id=current_service.id), + "classes": "usa-button--outline" + }) }} + {% endif %} +
{% if show_search_box %}
@@ -84,15 +94,4 @@ {% endfor %}
- {% if current_user.has_permissions('manage_service') %} -
- {{ usaButton({ - "element": "a", - "text": "Invite a team member", - "href": url_for('.invite_user', service_id=current_service.id), - "classes": "usa-button" - }) }} -
- {% endif %} - {% endblock %} diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py index abc23b563..c5d97bd03 100644 --- a/tests/app/main/views/test_manage_users.py +++ b/tests/app/main/views/test_manage_users.py @@ -775,15 +775,11 @@ def test_should_show_page_for_inviting_user( def test_should_not_show_page_for_inviting_user_without_permissions( - client_request, - mock_get_template_folders, - active_user_empty_permissions + client_request, mock_get_template_folders, active_user_empty_permissions ): client_request.login(active_user_empty_permissions) page = client_request.get( - "main.invite_user", - service_id=SERVICE_ONE_ID, - _expected_status=403 + "main.invite_user", service_id=SERVICE_ONE_ID, _expected_status=403 ) assert "not allowed to see this page" in page.h1.string.strip() @@ -815,7 +811,7 @@ def test_should_show_page_for_inviting_user_with_email_prefilled( user_id=fake_uuid, # We have the user’s name in the H1 but don’t want it duplicated # in the page title - _test_page_title=False + _test_page_title=False, ) assert normalize_spaces(page.select_one("title").text).startswith( "Invite a team member" @@ -830,7 +826,7 @@ def test_should_show_page_if_prefilled_user_is_already_a_team_member( mock_get_template_folders, fake_uuid, active_user_with_permissions, - active_caseworking_user + active_caseworking_user, ): client_request.login(active_user_with_permissions) mocker.patch( From 13ed67b18b8cfeb1225ee72f5a9801d2823434fb Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Tue, 12 Dec 2023 16:45:21 -0500 Subject: [PATCH 15/22] 966 - Added 2 urls to the CSP configuration + adjusted the test --- app/__init__.py | 2 ++ tests/app/main/views/test_headers.py | 4 +++- tests/app/main/views/test_manage_users.py | 12 ++++-------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 4346301da..0923b8a50 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -150,6 +150,8 @@ def _csp(config): "https://js-agent.newrelic.com", "https://gov-bam.nr-data.net", "https://www.googletagmanager.com", + "https://www.google-analytics.com", + "https://dap.digitalgov.gov", ], "connect-src": ["'self'", "https://gov-bam.nr-data.net"], "style-src": ["'self'", asset_domain], diff --git a/tests/app/main/views/test_headers.py b/tests/app/main/views/test_headers.py index de0cef7d2..fa6901617 100644 --- a/tests/app/main/views/test_headers.py +++ b/tests/app/main/views/test_headers.py @@ -18,7 +18,9 @@ def test_owasp_useful_headers_set( assert search( r"script-src 'self' static\.example\.com 'unsafe-eval' https:\/\/js-agent\.new" r"relic\.com https:\/\/gov-bam\.nr-data\.net https:\/\/www\.googletagmanager\." - r"com 'nonce-.*';", + r"com https:\/\/www\.google-analytics\." + r"com https:\/\/dap\.digitalgov\." + r"gov 'nonce-.*';", csp, ) assert search(r"connect-src 'self' https:\/\/gov-bam.nr-data\.net;", csp) diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py index abc23b563..c5d97bd03 100644 --- a/tests/app/main/views/test_manage_users.py +++ b/tests/app/main/views/test_manage_users.py @@ -775,15 +775,11 @@ def test_should_show_page_for_inviting_user( def test_should_not_show_page_for_inviting_user_without_permissions( - client_request, - mock_get_template_folders, - active_user_empty_permissions + client_request, mock_get_template_folders, active_user_empty_permissions ): client_request.login(active_user_empty_permissions) page = client_request.get( - "main.invite_user", - service_id=SERVICE_ONE_ID, - _expected_status=403 + "main.invite_user", service_id=SERVICE_ONE_ID, _expected_status=403 ) assert "not allowed to see this page" in page.h1.string.strip() @@ -815,7 +811,7 @@ def test_should_show_page_for_inviting_user_with_email_prefilled( user_id=fake_uuid, # We have the user’s name in the H1 but don’t want it duplicated # in the page title - _test_page_title=False + _test_page_title=False, ) assert normalize_spaces(page.select_one("title").text).startswith( "Invite a team member" @@ -830,7 +826,7 @@ def test_should_show_page_if_prefilled_user_is_already_a_team_member( mock_get_template_folders, fake_uuid, active_user_with_permissions, - active_caseworking_user + active_caseworking_user, ): client_request.login(active_user_with_permissions) mocker.patch( From 6297091022213bbf15381aecee48e3f0734fc1f8 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Wed, 13 Dec 2023 08:50:25 -0500 Subject: [PATCH 16/22] 1004 - Adding GA to connect-src --- app/__init__.py | 6 +++++- tests/app/main/views/test_headers.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 0923b8a50..c8224e21e 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -153,7 +153,11 @@ def _csp(config): "https://www.google-analytics.com", "https://dap.digitalgov.gov", ], - "connect-src": ["'self'", "https://gov-bam.nr-data.net"], + "connect-src": [ + "'self'", + "https://gov-bam.nr-data.net", + "https://www.google-analytics.com", + ], "style-src": ["'self'", asset_domain], "img-src": ["'self'", asset_domain, logo_domain], } diff --git a/tests/app/main/views/test_headers.py b/tests/app/main/views/test_headers.py index fa6901617..211601d16 100644 --- a/tests/app/main/views/test_headers.py +++ b/tests/app/main/views/test_headers.py @@ -23,6 +23,10 @@ def test_owasp_useful_headers_set( r"gov 'nonce-.*';", csp, ) - assert search(r"connect-src 'self' https:\/\/gov-bam.nr-data\.net;", csp) + assert search( + r"connect-src 'self' https:\/\/gov-bam.nr-data\.net https:\/\/www\.google-analytics\." + r"com;", + csp, + ) assert search(r"style-src 'self' static\.example\.com 'nonce-.*';", csp) assert search(r"img-src 'self' static\.example\.com static-logos\.test\.com", csp) From 0947c5d3362d77b9d0920ff344fad9a683c0ed7f Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Wed, 13 Dec 2023 11:52:59 -0500 Subject: [PATCH 17/22] Update utils to 0.2.4 release This changeset updates the utils library to our 0.2.4 release. Signed-off-by: Carlo Costino --- poetry.lock | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/poetry.lock b/poetry.lock index dcb285933..4dcb8829f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1432,16 +1432,6 @@ files = [ {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, - {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, @@ -1690,7 +1680,7 @@ requests = ">=2.0.0" [[package]] name = "notifications-utils" -version = "0.2.3" +version = "0.2.4" description = "" optional = false python-versions = ">=3.9,<3.12" @@ -1742,7 +1732,7 @@ werkzeug = "^3.0.1" type = "git" url = "https://github.com/GSA/notifications-utils.git" reference = "HEAD" -resolved_reference = "4cdd67a377f4a6dea1f96b26ba5a1a4bca9afce3" +resolved_reference = "bd604dc32ea80b5d8a1157b09653e4bd4a755a6e" [[package]] name = "numpy" From 56b3cd9fd59f7b6aed792e6678211b3d4ee0bf72 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Wed, 13 Dec 2023 12:04:56 -0500 Subject: [PATCH 18/22] Fixed failing test given new character handling in utils update Signed-off-by: Carlo Costino --- tests/app/main/views/test_templates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py index fd202f47d..4fddce76d 100644 --- a/tests/app/main/views/test_templates.py +++ b/tests/app/main/views/test_templates.py @@ -632,7 +632,7 @@ def test_should_show_sms_template_with_downgraded_unicode_characters( fake_uuid, ): msg = "here:\tare some “fancy quotes” and zero\u200Bwidth\u200Bspaces" - rendered_msg = 'here: are some "fancy quotes" and zerowidthspaces' + rendered_msg = 'here: are some “fancy quotes” and zerowidthspaces' mocker.patch( "app.service_api_client.get_service_template", From 353383d3230a4bb2de36719182c7ffed77ced64f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 17:11:55 +0000 Subject: [PATCH 19/22] Bump postcss and @uswds/compile Bumps [postcss](https://github.com/postcss/postcss) to 8.4.31 and updates ancestor dependency [@uswds/compile](https://github.com/uswds/uswds-compile). These dependencies need to be updated together. Updates `postcss` from 7.0.39 to 8.4.31 - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/7.0.39...8.4.31) Updates `@uswds/compile` from 1.0.0 to 1.1.0 - [Release notes](https://github.com/uswds/uswds-compile/releases) - [Commits](https://github.com/uswds/uswds-compile/compare/v1.0.0...v1.1.0) --- updated-dependencies: - dependency-name: postcss dependency-type: indirect - dependency-name: "@uswds/compile" dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- package-lock.json | 262 ++++++++-------------------------------------- package.json | 2 +- 2 files changed, 44 insertions(+), 220 deletions(-) diff --git a/package-lock.json b/package-lock.json index 39b5837d4..e8be05aa4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "devDependencies": { "@babel/core": "7.19.6", "@babel/preset-env": "7.19.4", - "@uswds/compile": "^1.0.0", + "@uswds/compile": "^1.1.0", "better-npm-audit": "^3.7.3", "gulp": "4.0.2", "gulp-add-src": "1.0.0", @@ -2720,9 +2720,9 @@ "dev": true }, "node_modules/@types/vinyl": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.9.tgz", - "integrity": "sha512-KCr4aTEUkzSF89qw09e2oxsC/RXXT3K5ZPv4gvj3XTiWVrxNoi7WrqNTahNE/Hul5C9z3B8w+yWNTQgua12oag==", + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.11.tgz", + "integrity": "sha512-vPXzCLmRp74e9LsP8oltnWKTH+jBwt86WgRUb4Pc9Lf3pkMVGyvIo2gm9bODeGfCay2DBB/hAWDuvf07JcK4rw==", "dev": true, "dependencies": { "@types/expect": "^1.20.4", @@ -2745,201 +2745,23 @@ "dev": true }, "node_modules/@uswds/compile": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@uswds/compile/-/compile-1.0.0.tgz", - "integrity": "sha512-dIAL2cr6K+QnSNr/fe7Y2Db06rkxMla5VtockxHF+CYcBl3DbJ8qbMn/kxouYDX5rgN0So2PbMAouzpM7uhyMA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@uswds/compile/-/compile-1.1.0.tgz", + "integrity": "sha512-kKlszBhO13v/qa1jaNqaOWiAJjuKtASHCxjmu+OXw/wMGVdaJcNjkM8hWL9/sx4AUe07PBwlJoGPtkKRWqSxWw==", "dev": true, "dependencies": { - "autoprefixer": "10.4.13", - "del": "6.0.0", + "autoprefixer": "10.4.16", + "del": "6.1.1", "gulp": "4.0.2", "gulp-postcss": "9.0.1", "gulp-rename": "2.0.0", - "gulp-replace": "1.1.3", + "gulp-replace": "1.1.4", "gulp-sass": "5.1.0", "gulp-sourcemaps": "3.0.0", "gulp-svgstore": "9.0.0", - "postcss": "8.4.19", + "postcss": "8.4.31", "postcss-csso": "6.0.1", - "sass-embedded": "1.56.1" - } - }, - "node_modules/@uswds/compile/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/@uswds/compile/node_modules/sass-embedded": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.56.1.tgz", - "integrity": "sha512-8VuohdRoGfqVWgBNeC+iqek1KXIVWYcG6AOQ6rJvRUe08HbdPQgp0+fseDQX7E5UxaoM8wvU5VBwCbZvPwFZQw==", - "dev": true, - "dependencies": { - "buffer-builder": "^0.2.0", - "google-protobuf": "^3.11.4", - "immutable": "^4.0.0", - "rxjs": "^7.4.0", - "supports-color": "^8.1.1" - }, - "engines": { - "node": ">=14.0.0" - }, - "optionalDependencies": { - "sass-embedded-darwin-arm64": "1.56.1", - "sass-embedded-darwin-x64": "1.56.1", - "sass-embedded-linux-arm": "1.56.1", - "sass-embedded-linux-arm64": "1.56.1", - "sass-embedded-linux-ia32": "1.56.1", - "sass-embedded-linux-x64": "1.56.1", - "sass-embedded-win32-ia32": "1.56.1", - "sass-embedded-win32-x64": "1.56.1" - } - }, - "node_modules/@uswds/compile/node_modules/sass-embedded-darwin-arm64": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.56.1.tgz", - "integrity": "sha512-Y6us8rg7uwLtAzGiKDebAhFn98RLpW3u5Jnfbsvetlm/rDJ1fZg/roVXFttepLdVbYBjimVFTUaNuGxU3bWbBA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@uswds/compile/node_modules/sass-embedded-darwin-x64": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.56.1.tgz", - "integrity": "sha512-UypB3IREbreNNc+dG+L6hG5yoeTujKDCdmu38SSSS/zl9XBFTc8McX58SWapTJOUFK8G43CCimfB3r8FOcyNfA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@uswds/compile/node_modules/sass-embedded-linux-arm": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.56.1.tgz", - "integrity": "sha512-pXv+2HlMsjlk0g3dzuVhofuUNJZWUfWVe5xbbWHv+wrdH9kuui6WOyHDhSdUolPrRXOrdsG6Z4/Balr9wa1JWQ==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@uswds/compile/node_modules/sass-embedded-linux-arm64": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.56.1.tgz", - "integrity": "sha512-Ly2wk8EmhjXkBpNPM+yAygSxTVIBjQlf4cDAHYgsaDUIIvRSAKAe2CUmxJjik069Qmv54g+Ac7WF6k63c2CTNw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@uswds/compile/node_modules/sass-embedded-linux-ia32": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.56.1.tgz", - "integrity": "sha512-cGmhnHdCbwJsQgsogwmlALzS/j8g+qQTiBuKBcXIWyFn4hLWo2BAr4Gm9vY5p+8aapcYrRQF9b0nwpFQcUScOg==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@uswds/compile/node_modules/sass-embedded-linux-x64": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.56.1.tgz", - "integrity": "sha512-yMXS37lP3abTI5ThuydOrLacSNz4Oo9+xlfQDR0pntrugdKzH7vHWK7T7Ynd+vGjVqFajUhI+VihP7vZlhhndw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@uswds/compile/node_modules/sass-embedded-win32-ia32": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.56.1.tgz", - "integrity": "sha512-cjtuKc1O0F+yQZ8hLLYhalulEkBZ6HPdR/ys0l6hn7KTlrYooMyvZXbdU5KaB2lfK1WD29I0HefT8Em7d9cpfA==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@uswds/compile/node_modules/sass-embedded-win32-x64": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.56.1.tgz", - "integrity": "sha512-VxqwSluQdNBdBEx0p6N2dOrGPIEL3AcG62KuDJ4KD/rHPQgoCPiJvLa5MXKdVHC24tHgE2AYlirILS/iE/N1NQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@uswds/compile/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" + "sass-embedded": "1.69.5" } }, "node_modules/@uswds/uswds": { @@ -3527,9 +3349,9 @@ } }, "node_modules/autoprefixer": { - "version": "10.4.13", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz", - "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==", + "version": "10.4.16", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz", + "integrity": "sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==", "dev": true, "funding": [ { @@ -3539,12 +3361,16 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/autoprefixer" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "browserslist": "^4.21.4", - "caniuse-lite": "^1.0.30001426", - "fraction.js": "^4.2.0", + "browserslist": "^4.21.10", + "caniuse-lite": "^1.0.30001538", + "fraction.js": "^4.3.6", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", "postcss-value-parser": "^4.2.0" @@ -4946,9 +4772,9 @@ } }, "node_modules/del": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz", - "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz", + "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==", "dev": true, "dependencies": { "globby": "^11.0.1", @@ -5558,9 +5384,9 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", - "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -6164,12 +5990,6 @@ "node": ">= 0.10" } }, - "node_modules/google-protobuf": { - "version": "3.21.2", - "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.21.2.tgz", - "integrity": "sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==", - "dev": true - }, "node_modules/gopd": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", @@ -6845,12 +6665,12 @@ } }, "node_modules/gulp-replace": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.3.tgz", - "integrity": "sha512-HcPHpWY4XdF8zxYkDODHnG2+7a3nD/Y8Mfu3aBgMiCFDW3X2GiOKXllsAmILcxe3KZT2BXoN18WrpEFm48KfLQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.4.tgz", + "integrity": "sha512-SVSF7ikuWKhpAW4l4wapAqPPSToJoiNKsbDoUnRrSgwZHH7lH8pbPeQj1aOVYQrbZKhfSVBxVW+Py7vtulRktw==", "dev": true, "dependencies": { - "@types/node": "^14.14.41", + "@types/node": "*", "@types/vinyl": "^2.0.4", "istextorbinary": "^3.0.0", "replacestream": "^4.0.3", @@ -7432,9 +7252,9 @@ } }, "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz", + "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==", "dev": true, "engines": { "node": ">= 4" @@ -11752,9 +11572,9 @@ } }, "node_modules/postcss": { - "version": "8.4.19", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz", - "integrity": "sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "funding": [ { @@ -11764,10 +11584,14 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, diff --git a/package.json b/package.json index 5af658b12..f0bbc97f4 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "@babel/core": "7.19.6", "@babel/preset-env": "7.19.4", - "@uswds/compile": "^1.0.0", + "@uswds/compile": "^1.1.0", "better-npm-audit": "^3.7.3", "gulp": "4.0.2", "gulp-add-src": "1.0.0", From f4ba5b83c6a5ca77400f7200127b38ebe6a80753 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 22:21:29 +0000 Subject: [PATCH 20/22] Bump pre-commit from 3.5.0 to 3.6.0 Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.5.0 to 3.6.0. - [Release notes](https://github.com/pre-commit/pre-commit/releases) - [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit/compare/v3.5.0...v3.6.0) --- updated-dependencies: - dependency-name: pre-commit dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 20 +++++++++++++++----- pyproject.toml | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index d8efb4dee..c917bd0e3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1432,6 +1432,16 @@ files = [ {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, @@ -1988,13 +1998,13 @@ testing = ["pytest", "pytest-benchmark"] [[package]] name = "pre-commit" -version = "3.5.0" +version = "3.6.0" description = "A framework for managing and maintaining multi-language pre-commit hooks." optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "pre_commit-3.5.0-py2.py3-none-any.whl", hash = "sha256:841dc9aef25daba9a0238cd27984041fa0467b4199fc4852e27950664919f660"}, - {file = "pre_commit-3.5.0.tar.gz", hash = "sha256:5804465c675b659b0862f07907f96295d490822a450c4c40e747d0b1c6ebcb32"}, + {file = "pre_commit-3.6.0-py2.py3-none-any.whl", hash = "sha256:c255039ef399049a5544b6ce13d135caba8f2c28c3b4033277a788f434308376"}, + {file = "pre_commit-3.6.0.tar.gz", hash = "sha256:d30bad9abf165f7785c15a21a1f46da7d0677cb00ee7ff4c579fd38922efe15d"}, ] [package.dependencies] @@ -3078,4 +3088,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "cbc1f1bd362257b864862976a30c1c80c8e2117378074593c46cdb96c32eae4c" +content-hash = "a213a7cd21836a4e03ddcb39399f31d132300eee5479e9d135adc474c4066594" diff --git a/pyproject.toml b/pyproject.toml index 37c8b2d5c..38d77294b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,7 +52,7 @@ isort = "^5.12.0" jinja2-cli = {version = "==0.8.2", extras = ["yaml"]} moto = "^4.2" pip-audit = "*" -pre-commit = "^3.5.0" +pre-commit = "^3.6.0" pytest = "^7.4.3" pytest-env = "^1.1.3" pytest-mock = "^3.12.0" From ee11a048d55cce7abfc748e7a3609fde5b1be1a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 22:29:34 +0000 Subject: [PATCH 21/22] Bump black from 23.11.0 to 23.12.0 Bumps [black](https://github.com/psf/black) from 23.11.0 to 23.12.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/23.11.0...23.12.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 46 +++++++++++++++++++++++++--------------------- pyproject.toml | 2 +- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/poetry.lock b/poetry.lock index c917bd0e3..16facd0b0 100644 --- a/poetry.lock +++ b/poetry.lock @@ -82,29 +82,33 @@ lxml = ["lxml"] [[package]] name = "black" -version = "23.11.0" +version = "23.12.0" description = "The uncompromising code formatter." optional = false python-versions = ">=3.8" files = [ - {file = "black-23.11.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:dbea0bb8575c6b6303cc65017b46351dc5953eea5c0a59d7b7e3a2d2f433a911"}, - {file = "black-23.11.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:412f56bab20ac85927f3a959230331de5614aecda1ede14b373083f62ec24e6f"}, - {file = "black-23.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d136ef5b418c81660ad847efe0e55c58c8208b77a57a28a503a5f345ccf01394"}, - {file = "black-23.11.0-cp310-cp310-win_amd64.whl", hash = "sha256:6c1cac07e64433f646a9a838cdc00c9768b3c362805afc3fce341af0e6a9ae9f"}, - {file = "black-23.11.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:cf57719e581cfd48c4efe28543fea3d139c6b6f1238b3f0102a9c73992cbb479"}, - {file = "black-23.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:698c1e0d5c43354ec5d6f4d914d0d553a9ada56c85415700b81dc90125aac244"}, - {file = "black-23.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:760415ccc20f9e8747084169110ef75d545f3b0932ee21368f63ac0fee86b221"}, - {file = "black-23.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:58e5f4d08a205b11800332920e285bd25e1a75c54953e05502052738fe16b3b5"}, - {file = "black-23.11.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:45aa1d4675964946e53ab81aeec7a37613c1cb71647b5394779e6efb79d6d187"}, - {file = "black-23.11.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4c44b7211a3a0570cc097e81135faa5f261264f4dfaa22bd5ee2875a4e773bd6"}, - {file = "black-23.11.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2a9acad1451632021ee0d146c8765782a0c3846e0e0ea46659d7c4f89d9b212b"}, - {file = "black-23.11.0-cp38-cp38-win_amd64.whl", hash = "sha256:fc7f6a44d52747e65a02558e1d807c82df1d66ffa80a601862040a43ec2e3142"}, - {file = "black-23.11.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7f622b6822f02bfaf2a5cd31fdb7cd86fcf33dab6ced5185c35f5db98260b055"}, - {file = "black-23.11.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:250d7e60f323fcfc8ea6c800d5eba12f7967400eb6c2d21ae85ad31c204fb1f4"}, - {file = "black-23.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5133f5507007ba08d8b7b263c7aa0f931af5ba88a29beacc4b2dc23fcefe9c06"}, - {file = "black-23.11.0-cp39-cp39-win_amd64.whl", hash = "sha256:421f3e44aa67138ab1b9bfbc22ee3780b22fa5b291e4db8ab7eee95200726b07"}, - {file = "black-23.11.0-py3-none-any.whl", hash = "sha256:54caaa703227c6e0c87b76326d0862184729a69b73d3b7305b6288e1d830067e"}, - {file = "black-23.11.0.tar.gz", hash = "sha256:4c68855825ff432d197229846f971bc4d6666ce90492e5b02013bcaca4d9ab05"}, + {file = "black-23.12.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:67f19562d367468ab59bd6c36a72b2c84bc2f16b59788690e02bbcb140a77175"}, + {file = "black-23.12.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:bbd75d9f28a7283b7426160ca21c5bd640ca7cd8ef6630b4754b6df9e2da8462"}, + {file = "black-23.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:593596f699ca2dcbbbdfa59fcda7d8ad6604370c10228223cd6cf6ce1ce7ed7e"}, + {file = "black-23.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:12d5f10cce8dc27202e9a252acd1c9a426c83f95496c959406c96b785a92bb7d"}, + {file = "black-23.12.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e73c5e3d37e5a3513d16b33305713237a234396ae56769b839d7c40759b8a41c"}, + {file = "black-23.12.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ba09cae1657c4f8a8c9ff6cfd4a6baaf915bb4ef7d03acffe6a2f6585fa1bd01"}, + {file = "black-23.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ace64c1a349c162d6da3cef91e3b0e78c4fc596ffde9413efa0525456148873d"}, + {file = "black-23.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:72db37a2266b16d256b3ea88b9affcdd5c41a74db551ec3dd4609a59c17d25bf"}, + {file = "black-23.12.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:fdf6f23c83078a6c8da2442f4d4eeb19c28ac2a6416da7671b72f0295c4a697b"}, + {file = "black-23.12.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:39dda060b9b395a6b7bf9c5db28ac87b3c3f48d4fdff470fa8a94ab8271da47e"}, + {file = "black-23.12.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7231670266ca5191a76cb838185d9be59cfa4f5dd401b7c1c70b993c58f6b1b5"}, + {file = "black-23.12.0-cp312-cp312-win_amd64.whl", hash = "sha256:193946e634e80bfb3aec41830f5d7431f8dd5b20d11d89be14b84a97c6b8bc75"}, + {file = "black-23.12.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bcf91b01ddd91a2fed9a8006d7baa94ccefe7e518556470cf40213bd3d44bbbc"}, + {file = "black-23.12.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:996650a89fe5892714ea4ea87bc45e41a59a1e01675c42c433a35b490e5aa3f0"}, + {file = "black-23.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bdbff34c487239a63d86db0c9385b27cdd68b1bfa4e706aa74bb94a435403672"}, + {file = "black-23.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:97af22278043a6a1272daca10a6f4d36c04dfa77e61cbaaf4482e08f3640e9f0"}, + {file = "black-23.12.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ead25c273adfad1095a8ad32afdb8304933efba56e3c1d31b0fee4143a1e424a"}, + {file = "black-23.12.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c71048345bdbced456cddf1622832276d98a710196b842407840ae8055ade6ee"}, + {file = "black-23.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:81a832b6e00eef2c13b3239d514ea3b7d5cc3eaa03d0474eedcbbda59441ba5d"}, + {file = "black-23.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:6a82a711d13e61840fb11a6dfecc7287f2424f1ca34765e70c909a35ffa7fb95"}, + {file = "black-23.12.0-py3-none-any.whl", hash = "sha256:a7c07db8200b5315dc07e331dda4d889a56f6bf4db6a9c2a526fa3166a81614f"}, + {file = "black-23.12.0.tar.gz", hash = "sha256:330a327b422aca0634ecd115985c1c7fd7bdb5b5a2ef8aa9888a82e2ebe9437a"}, ] [package.dependencies] @@ -118,7 +122,7 @@ typing-extensions = {version = ">=4.0.1", markers = "python_version < \"3.11\""} [package.extras] colorama = ["colorama (>=0.4.3)"] -d = ["aiohttp (>=3.7.4)"] +d = ["aiohttp (>=3.7.4)", "aiohttp (>=3.7.4,!=3.9.0)"] jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] uvloop = ["uvloop (>=0.15.2)"] @@ -3088,4 +3092,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "a213a7cd21836a4e03ddcb39399f31d132300eee5479e9d135adc474c4066594" +content-hash = "cf9d2dab790cb8088a41f3c5b7c261b23e21ae0d2da314dc9a4a2c39266fda64" diff --git a/pyproject.toml b/pyproject.toml index 38d77294b..ba94e341a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ wtforms = "~=3.1" [tool.poetry.group.dev.dependencies] bandit = "*" beautifulsoup4 = "^4.12.2" -black = "^23.11.0" +black = "^23.12.0" coverage = "*" freezegun = "^1.3.1" flake8 = "^6.1.0" From 4a5347ccefc8dd98f8f52354805721dae58c7f53 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 22:37:58 +0000 Subject: [PATCH 22/22] Bump isort from 5.12.0 to 5.13.2 Bumps [isort](https://github.com/pycqa/isort) from 5.12.0 to 5.13.2. - [Release notes](https://github.com/pycqa/isort/releases) - [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md) - [Commits](https://github.com/pycqa/isort/compare/5.12.0...5.13.2) --- updated-dependencies: - dependency-name: isort dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 13 +++++-------- pyproject.toml | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/poetry.lock b/poetry.lock index 16facd0b0..208ea3b0e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1157,20 +1157,17 @@ files = [ [[package]] name = "isort" -version = "5.12.0" +version = "5.13.2" description = "A Python utility / library to sort Python imports." optional = false python-versions = ">=3.8.0" files = [ - {file = "isort-5.12.0-py3-none-any.whl", hash = "sha256:f84c2818376e66cf843d497486ea8fed8700b340f308f076c6fb1229dff318b6"}, - {file = "isort-5.12.0.tar.gz", hash = "sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504"}, + {file = "isort-5.13.2-py3-none-any.whl", hash = "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6"}, + {file = "isort-5.13.2.tar.gz", hash = "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109"}, ] [package.extras] -colors = ["colorama (>=0.4.3)"] -pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"] -plugins = ["setuptools"] -requirements-deprecated-finder = ["pip-api", "pipreqs"] +colors = ["colorama (>=0.4.6)"] [[package]] name = "itsdangerous" @@ -3092,4 +3089,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "cf9d2dab790cb8088a41f3c5b7c261b23e21ae0d2da314dc9a4a2c39266fda64" +content-hash = "8a6fa375211952359f5993261b082558dae34ce3d80ee113ae51d10ecd426937" diff --git a/pyproject.toml b/pyproject.toml index ba94e341a..1d6f1dca9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,7 @@ flake8 = "^6.1.0" flake8-bugbear = "^23.12.2" flake8-print = "^5.0.0" flake8-pytest-style = "^1.7.2" -isort = "^5.12.0" +isort = "^5.13.2" jinja2-cli = {version = "==0.8.2", extras = ["yaml"]} moto = "^4.2" pip-audit = "*"