From e23186ef7f8380e6a732d44f54e4020bca021ed4 Mon Sep 17 00:00:00 2001
From: Oliver Roberts <oliver.roberts@digital.trade.gov.uk>
Date: Thu, 8 Aug 2024 08:15:09 +0100
Subject: [PATCH] Bump pytest to 8.3.2 to resolve TypeError when running in
 Python 3.10 envs

See [this PR thread](https://github.com/pytest-dev/pytest/pull/8540) for more information.
---
 requirements-dev.in  |  2 +-
 requirements-dev.txt | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/requirements-dev.in b/requirements-dev.in
index b1af708e..6f80d648 100644
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -14,7 +14,7 @@ pytest-cov
 pytest-django
 pytest-env
 pytest-mock
-pytest
+pytest==8.3.2
 requests-mock
 factory_boy
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 0404eba3..57965a01 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -18,13 +18,10 @@ async-timeout==4.0.3
     # via
     #   -r requirements.txt
     #   redis
-atomicwrites==1.3.0
-    # via pytest
 attrs==23.2.0
     # via
     #   -r requirements.txt
     #   jsonschema
-    #   pytest
     #   referencing
 backoff==1.10.0
     # via
@@ -156,6 +153,8 @@ ecs-logging==2.2.0
     #   elastic-apm
 elastic-apm==6.23.0
     # via -r requirements.txt
+exceptiongroup==1.2.2
+    # via pytest
 factory-boy==3.3.0
     # via -r requirements-dev.in
 faker==2.0.4
@@ -205,11 +204,12 @@ importlib-metadata==6.11.0
     # via
     #   -r requirements.txt
     #   opentelemetry-api
-    #   pytest
 inflection==0.5.1
     # via
     #   -r requirements.txt
     #   drf-spectacular
+iniconfig==2.0.0
+    # via pytest
 jmespath==0.10.0
     # via
     #   -r requirements.txt
@@ -229,8 +229,6 @@ kombu==5.3.7
     #   celery
 mccabe==0.7.0
     # via flake8
-more-itertools==7.0.0
-    # via pytest
 nodeenv==1.8.0
     # via
     #   -r requirements.txt
@@ -322,7 +320,7 @@ platformdirs==4.2.0
     # via
     #   -r requirements.txt
     #   virtualenv
-pluggy==0.13.1
+pluggy==1.5.0
     # via pytest
 pre-commit==3.7.0
     # via
@@ -343,8 +341,6 @@ protobuf==4.25.3
     #   opentelemetry-proto
 psycopg2==2.9.9
     # via -r requirements.txt
-py==1.10.0
-    # via pytest
 pycodestyle==2.12.0
     # via
     #   flake8
@@ -357,7 +353,7 @@ pyjwt==2.4.0
     # via
     #   -r requirements.txt
     #   notifications-python-client
-pytest==4.6.3
+pytest==8.3.2
     # via
     #   -r requirements-dev.in
     #   pytest-cov
@@ -432,7 +428,6 @@ six==1.16.0
     #   -r requirements.txt
     #   click-repl
     #   faker
-    #   pytest
     #   python-dateutil
     #   requests-mock
 smart-open==7.0.4
@@ -444,7 +439,9 @@ sqlparse==0.5.0
 text-unidecode==1.3
     # via faker
 tomli==2.0.1
-    # via coverage
+    # via
+    #   coverage
+    #   pytest
 typing-extensions==4.11.0
     # via
     #   -r requirements.txt
@@ -483,7 +480,6 @@ wcwidth==0.2.5
     # via
     #   -r requirements.txt
     #   prompt-toolkit
-    #   pytest
 whitenoise==6.7.0
     # via -r requirements.txt
 wrapt==1.16.0