From 474930401270271cdc115af9317f2cf947a33f42 Mon Sep 17 00:00:00 2001 From: chris48s Date: Wed, 18 Sep 2024 14:08:23 +0100 Subject: [PATCH] fix setuptools dependency We had managed to get into a state where our lockfile had 2 different versions of setuptools in it - https://github.com/DemocracyClub/ec-api-proxy/blob/fb5b26543aec4a361170acd75091697a6d0f9853/Pipfile.lock#L474-L482 - https://github.com/DemocracyClub/ec-api-proxy/blob/fb5b26543aec4a361170acd75091697a6d0f9853/Pipfile.lock#L1109-L1116 Unsurprisingly, this was causing problems. This commit pins both versions of setuptools (in main and dev packages) to the same version. --- Pipfile.lock | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 90b96bd..6b3ddbf 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1108,11 +1108,12 @@ }, "setuptools": { "hashes": [ - "sha256:6875bbd06382d857b1b90cd07cee6a2df701a164f241095706b5192bc56c5c62", - "sha256:f25195d54deb649832182d6455bffba7ac3d8fe71d35185e738d2198a4310044" + "sha256:5f4c08aa4d3ebcb57a50c33b1b07e94315d7fc7230f7115e47fc99776c8ce308", + "sha256:95b40ed940a1c67eb70fc099094bd6e99c6ee7c23aa2306f4d2697ba7916f9c6" ], + "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==69.0.1" + "version": "==74.1.2" }, "six": { "hashes": [