From b6b8b740351d4fc2f8c0ca17683e5343b76e6496 Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Wed, 6 Apr 2022 13:42:20 +0100 Subject: [PATCH 1/2] Bump pyexcel-ods3 to 0.6.1 --- requirements.in | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index aab617f40..8207eb3ce 100644 --- a/requirements.in +++ b/requirements.in @@ -16,7 +16,7 @@ pyexcel==0.7.0 pyexcel-io==0.6.6 pyexcel-xls==0.7.0 pyexcel-xlsx==0.6.0 -pyexcel-ods3==0.6.0 +pyexcel-ods3==0.6.1 pytz==2022.1 # Should be pinned until a new gunicorn release greater than 20.1.0 comes out. (Due to eventlet v0.33 compatibility issues) git+https://github.com/benoitc/gunicorn.git@1299ea9e967a61ae2edebe191082fd169b864c64#egg=gunicorn[eventlet]==20.1.0 diff --git a/requirements.txt b/requirements.txt index 066715ca1..93d36b8ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -148,7 +148,7 @@ pyexcel-io==0.6.6 # pyexcel-ods3 # pyexcel-xls # pyexcel-xlsx -pyexcel-ods3==0.6.0 +pyexcel-ods3==0.6.1 # via -r requirements.in pyexcel-xls==0.7.0 # via -r requirements.in From 31e287d039e31075427d4af3451c758e8722075a Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Wed, 6 Apr 2022 13:44:10 +0100 Subject: [PATCH 2/2] Unpin prometheus-client and use the latest version The prometheus-client was pinned to avoid installing version 0.10.0, which removed support for `prometheus_multiproc_dir` and renamed the variable `PROMETHEUS_MULTIPROC_DIR`. Version 0.10.1 reintroduced support for the lowercase `prometheus_multiproc_dir` environment variable. --- requirements.in | 3 +-- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/requirements.in b/requirements.in index 8207eb3ce..bdc112418 100644 --- a/requirements.in +++ b/requirements.in @@ -32,6 +32,5 @@ notifications-utils @ git+https://github.com/alphagov/notifications-utils.git@55 govuk-frontend-jinja @ git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.8-alpha # gds-metrics requires prometheseus 0.2.0, override that requirement as later versions bring significant performance gains -# version 0.10.0 introduced exceptions when workers crashed due to deprecating lower case `prometheus_multiproc_dir`. -prometheus-client>=0.9.0,!=0.10.0 +prometheus-client==0.14.0 gds-metrics==0.2.4 diff --git a/requirements.txt b/requirements.txt index 93d36b8ec..4dafab6b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -129,7 +129,7 @@ packaging==20.9 # via bleach phonenumbers==8.12.24 # via notifications-utils -prometheus-client==0.10.1 +prometheus-client==0.14.0 # via # -r requirements.in # gds-metrics