From 5b8b235cb64def74bb972002cc3d6924042214f7 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 18 Aug 2023 11:01:27 -0700 Subject: [PATCH 1/9] notify-admin-674 remove gds_metrics --- Pipfile | 2 -- app/__init__.py | 3 --- 2 files changed, 5 deletions(-) diff --git a/Pipfile b/Pipfile index ca0ab09d0..0369f5ba8 100644 --- a/Pipfile +++ b/Pipfile @@ -11,7 +11,6 @@ flask = "~=2.3" flask-basicauth = "~=0.2" flask-login = "~=0.6" flask-wtf = "~=1.1" -gds-metrics = {version = "==0.2.4", ref = "6f1840a57b6fb1ee40b7e84f2f18ec229de8aa72", git = "https://github.com/alphagov/gds_metrics_python.git"} govuk-bank-holidays = "==0.13" govuk-frontend-jinja = {version = "==0.5.8-alpha", git = "https://github.com/alphagov/govuk-frontend-jinja.git"} gunicorn = {version = "==20.1.0", extras = ["eventlet"], ref = "1299ea9e967a61ae2edebe191082fd169b864c64", git = "https://github.com/benoitc/gunicorn.git"} @@ -19,7 +18,6 @@ humanize = "~=4.8" itsdangerous = "~=2.1" jinja2 = "~=3.1" notifications-python-client = "==8.0.1" -prometheus-client = "==0.17.1" pyexcel = "==0.7.0" pyexcel-io = "==0.6.6" pyexcel-ods3 = "==0.6.1" diff --git a/app/__init__.py b/app/__init__.py index 5f244f630..874d36a0b 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -20,7 +20,6 @@ from flask_login import LoginManager, current_user from flask_talisman import Talisman from flask_wtf import CSRFProtect from flask_wtf.csrf import CSRFError -from gds_metrics import GDSMetrics from govuk_frontend_jinja.flask_ext import init_govuk_frontend from itsdangerous import BadSignature from notifications_python_client.errors import HTTPError @@ -128,7 +127,6 @@ from app.url_converters import ( login_manager = LoginManager() csrf = CSRFProtect() talisman = Talisman() -metrics = GDSMetrics() basic_auth = CustomBasicAuth() @@ -198,7 +196,6 @@ def create_app(application): # Note, metrics purposefully first so we start measuring response times as early as possible before any # other `app.before_request` handlers (introduced by any of these clients) are processed (which would # otherwise mean we aren't measuring the full response time) - metrics, csrf, login_manager, proxy_fix, From 864c3dd6d96d1a33cd3e65be5a80055e71671a69 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 22 Aug 2023 07:54:25 -0700 Subject: [PATCH 2/9] code review feedback --- app/__init__.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 874d36a0b..d6c4257bc 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -192,10 +192,6 @@ def create_app(application): init_jinja(application) for client in ( - # Gubbins - # Note, metrics purposefully first so we start measuring response times as early as possible before any - # other `app.before_request` handlers (introduced by any of these clients) are processed (which would - # otherwise mean we aren't measuring the full response time) csrf, login_manager, proxy_fix, From 0829fa2fad3d05d89c494bdaf0abe5ce93438dd8 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 22 Aug 2023 09:18:20 -0700 Subject: [PATCH 3/9] try changing org name --- Pipfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index 0369f5ba8..d4935efa7 100644 --- a/Pipfile +++ b/Pipfile @@ -12,7 +12,7 @@ flask-basicauth = "~=0.2" flask-login = "~=0.6" flask-wtf = "~=1.1" govuk-bank-holidays = "==0.13" -govuk-frontend-jinja = {version = "==0.5.8-alpha", git = "https://github.com/alphagov/govuk-frontend-jinja.git"} +govuk-frontend-jinja = {version = "==0.5.8-alpha", git = "https://github.com/Crown-Commercial-Service/govuk-frontend-jinja.git"} gunicorn = {version = "==20.1.0", extras = ["eventlet"], ref = "1299ea9e967a61ae2edebe191082fd169b864c64", git = "https://github.com/benoitc/gunicorn.git"} humanize = "~=4.8" itsdangerous = "~=2.1" From 502af3b8feb8b21a201c556cd4a6bdf45b298eab Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 22 Aug 2023 09:33:52 -0700 Subject: [PATCH 4/9] try downgrade to 0.5.5 --- Pipfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index d4935efa7..a3bd1b3b4 100644 --- a/Pipfile +++ b/Pipfile @@ -12,7 +12,7 @@ flask-basicauth = "~=0.2" flask-login = "~=0.6" flask-wtf = "~=1.1" govuk-bank-holidays = "==0.13" -govuk-frontend-jinja = {version = "==0.5.8-alpha", git = "https://github.com/Crown-Commercial-Service/govuk-frontend-jinja.git"} +govuk-frontend-jinja = {version = "==0.5.5-alpha", git = "https://github.com/Crown-Commercial-Service/govuk-frontend-jinja.git"} gunicorn = {version = "==20.1.0", extras = ["eventlet"], ref = "1299ea9e967a61ae2edebe191082fd169b864c64", git = "https://github.com/benoitc/gunicorn.git"} humanize = "~=4.8" itsdangerous = "~=2.1" From bf338368a1e33afb71a35353922ceb2b2452a30a Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 22 Aug 2023 09:59:49 -0700 Subject: [PATCH 5/9] change package name to v0.5.8-alpha --- Pipfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index a3bd1b3b4..e8496b1d4 100644 --- a/Pipfile +++ b/Pipfile @@ -12,7 +12,7 @@ flask-basicauth = "~=0.2" flask-login = "~=0.6" flask-wtf = "~=1.1" govuk-bank-holidays = "==0.13" -govuk-frontend-jinja = {version = "==0.5.5-alpha", git = "https://github.com/Crown-Commercial-Service/govuk-frontend-jinja.git"} +govuk-frontend-jinja = {version = "==v0.5.8-alpha", git = "https://github.com/Crown-Commercial-Service/govuk-frontend-jinja.git"} gunicorn = {version = "==20.1.0", extras = ["eventlet"], ref = "1299ea9e967a61ae2edebe191082fd169b864c64", git = "https://github.com/benoitc/gunicorn.git"} humanize = "~=4.8" itsdangerous = "~=2.1" From 9f62313332d30156e112ad3800482e3cf74c0825 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 22 Aug 2023 10:09:21 -0700 Subject: [PATCH 6/9] try using commit hash --- Pipfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index e8496b1d4..34308252c 100644 --- a/Pipfile +++ b/Pipfile @@ -12,7 +12,7 @@ flask-basicauth = "~=0.2" flask-login = "~=0.6" flask-wtf = "~=1.1" govuk-bank-holidays = "==0.13" -govuk-frontend-jinja = {version = "==v0.5.8-alpha", git = "https://github.com/Crown-Commercial-Service/govuk-frontend-jinja.git"} +govuk-frontend-jinja = {version = "==v0.5.8-alpha", ref = "191bc87c5c29cb8e2e65a21c1bb320eb0526f14a", git = "https://github.com/Crown-Commercial-Service/govuk-frontend-jinja.git"} gunicorn = {version = "==20.1.0", extras = ["eventlet"], ref = "1299ea9e967a61ae2edebe191082fd169b864c64", git = "https://github.com/benoitc/gunicorn.git"} humanize = "~=4.8" itsdangerous = "~=2.1" From feebdd2f59069dc378bfddb64d0024aa6f5b2ff8 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 22 Aug 2023 14:59:19 -0700 Subject: [PATCH 7/9] try another way --- Pipfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index 34308252c..3fa694e89 100644 --- a/Pipfile +++ b/Pipfile @@ -12,7 +12,7 @@ flask-basicauth = "~=0.2" flask-login = "~=0.6" flask-wtf = "~=1.1" govuk-bank-holidays = "==0.13" -govuk-frontend-jinja = {version = "==v0.5.8-alpha", ref = "191bc87c5c29cb8e2e65a21c1bb320eb0526f14a", git = "https://github.com/Crown-Commercial-Service/govuk-frontend-jinja.git"} +govuk-frontend-jinja = {version = "*", git = "https://github.com/alphagov/govuk-frontend-jinja.git"} gunicorn = {version = "==20.1.0", extras = ["eventlet"], ref = "1299ea9e967a61ae2edebe191082fd169b864c64", git = "https://github.com/benoitc/gunicorn.git"} humanize = "~=4.8" itsdangerous = "~=2.1" From 266416f07b5c2bae0da0d0db433bf848596afd15 Mon Sep 17 00:00:00 2001 From: stvnrlly Date: Tue, 22 Aug 2023 18:10:31 -0400 Subject: [PATCH 8/9] pin pipenv to older version --- .github/actions/setup-project/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-project/action.yml b/.github/actions/setup-project/action.yml index 3b4c4d911..a5f3db1de 100644 --- a/.github/actions/setup-project/action.yml +++ b/.github/actions/setup-project/action.yml @@ -15,7 +15,7 @@ runs: python-version: "3.9" - name: Install pipenv shell: bash - run: pip install --upgrade pipenv + run: pip install pipenv==2023.8.19 - name: Install application dependencies shell: bash run: make bootstrap From 8eba976ec1decbeab2108df80401e603d3432225 Mon Sep 17 00:00:00 2001 From: stvnrlly Date: Tue, 22 Aug 2023 18:12:51 -0400 Subject: [PATCH 9/9] one further step back in pipenv-land --- .github/actions/setup-project/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-project/action.yml b/.github/actions/setup-project/action.yml index a5f3db1de..f05f1ff1f 100644 --- a/.github/actions/setup-project/action.yml +++ b/.github/actions/setup-project/action.yml @@ -15,7 +15,7 @@ runs: python-version: "3.9" - name: Install pipenv shell: bash - run: pip install pipenv==2023.8.19 + run: pip install pipenv==2023.7.23 - name: Install application dependencies shell: bash run: make bootstrap