From d5b909b118a2a92ce25056b66c028b95334c55d8 Mon Sep 17 00:00:00 2001
From: danceratopz <danceratopz@gmail.com>
Date: Thu, 10 Apr 2025 16:09:39 +0200
Subject: [PATCH 1/2] chore(deps,pytest): update pytest to v8

---
 pyproject.toml | 2 +-
 uv.lock        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 422949d8d14..3418d3a4c13 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -28,7 +28,7 @@ dependencies = [
     "requests>=2.31.0,<3",
     "requests_unixsocket2>=0.4.0",
     "colorlog>=6.7.0,<7",
-    "pytest>7.3.2,<8",
+    "pytest>=8,<9",
     "pytest-custom-report>=1.0.1,<2",
     "pytest-html>=4.1.0,<5",
     "pytest-metadata>=3,<4",
diff --git a/uv.lock b/uv.lock
index 8dcfb7d63c0..44d7e262c77 100644
--- a/uv.lock
+++ b/uv.lock
@@ -585,7 +585,7 @@ requires-dist = [
     { name = "pydantic", specifier = ">=2.10.0,<3" },
     { name = "pyjwt", specifier = ">=2.3.0,<3" },
     { name = "pyspelling", marker = "extra == 'docs'", specifier = ">=2.8.2,<3" },
-    { name = "pytest", specifier = ">7.3.2,<8" },
+    { name = "pytest", specifier = ">=8,<9" },
     { name = "pytest-cov", marker = "extra == 'test'", specifier = ">=4.1.0,<5" },
     { name = "pytest-custom-report", specifier = ">=1.0.1,<2" },
     { name = "pytest-html", specifier = ">=4.1.0,<5" },
@@ -1488,7 +1488,7 @@ wheels = [
 
 [[package]]
 name = "pytest"
-version = "7.4.4"
+version = "8.3.5"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "colorama", marker = "sys_platform == 'win32'" },
@@ -1498,9 +1498,9 @@ dependencies = [
     { name = "pluggy" },
     { name = "tomli", marker = "python_full_version < '3.11'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/80/1f/9d8e98e4133ffb16c90f3b405c43e38d3abb715bb5d7a63a5a684f7e46a3/pytest-7.4.4.tar.gz", hash = "sha256:2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280", size = 1357116 }
+sdist = { url = "https://files.pythonhosted.org/packages/ae/3c/c9d525a414d506893f0cd8a8d0de7706446213181570cdbd766691164e40/pytest-8.3.5.tar.gz", hash = "sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845", size = 1450891 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/51/ff/f6e8b8f39e08547faece4bd80f89d5a8de68a38b2d179cc1c4490ffa3286/pytest-7.4.4-py3-none-any.whl", hash = "sha256:b090cdf5ed60bf4c45261be03239c2c1c22df034fbffe691abe93cd80cea01d8", size = 325287 },
+    { url = "https://files.pythonhosted.org/packages/30/3d/64ad57c803f1fa1e963a7946b6e0fea4a70df53c1a7fed304586539c2bac/pytest-8.3.5-py3-none-any.whl", hash = "sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820", size = 343634 },
 ]
 
 [[package]]

From a5469d7100fcbeb0903a17df8b93814ece6c9430 Mon Sep 17 00:00:00 2001
From: danceratopz <danceratopz@gmail.com>
Date: Thu, 10 Apr 2025 16:30:56 +0200
Subject: [PATCH 2/2] fix(consume): remove mark from fixture; it has no effect

  And causes a deprecation warning in pytest v8
  https://docs.pytest.org/en/stable/deprecations.html#applying-a-mark-to-a-fixture-function
---
 src/pytest_plugins/consume/hive_simulators/conftest.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pytest_plugins/consume/hive_simulators/conftest.py b/src/pytest_plugins/consume/hive_simulators/conftest.py
index ad84d86292b..35e8fa49d57 100644
--- a/src/pytest_plugins/consume/hive_simulators/conftest.py
+++ b/src/pytest_plugins/consume/hive_simulators/conftest.py
@@ -150,7 +150,6 @@ def total_timing_data(request) -> Generator[TimingData, None, None]:
 
 
 @pytest.fixture(scope="function")
-@pytest.mark.usefixtures("total_timing_data")
 def client_genesis(fixture: BlockchainFixtureCommon) -> dict:
     """Convert the fixture genesis block header and pre-state to a client genesis state."""
     genesis = to_json(fixture.genesis)