From dcfd7b9301ff394d3505aec7920d1607ea743922 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Wed, 13 Nov 2024 21:18:37 +0000
Subject: [PATCH] Adjust minimum scapy version to 2.6.1

---
 homeassistant/package_constraints.txt |  4 ++--
 script/gen_requirements_all.py        |  4 ++--
 tests/components/dhcp/conftest.py     | 21 ---------------------
 3 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 tests/components/dhcp/conftest.py

diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index abaf269103e52b..2cf702a769c486 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -181,8 +181,8 @@ chacha20poly1305-reuseable>=0.13.0
 # https://github.com/pycountry/pycountry/blob/ea69bab36f00df58624a0e490fdad4ccdc14268b/HISTORY.txt#L39
 pycountry>=23.12.11
 
-# scapy<2.5.0 will not work with python3.12
-scapy>=2.5.0
+# scapy==2.6.0 causes CI failures due to a race condition
+scapy>=2.6.1
 
 # tuf isn't updated to deal with breaking changes in securesystemslib==1.0.
 # Only tuf>=4 includes a constraint to <1.0.
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index c5611069bf5b8b..7d53741c661eb1 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -214,8 +214,8 @@
 # https://github.com/pycountry/pycountry/blob/ea69bab36f00df58624a0e490fdad4ccdc14268b/HISTORY.txt#L39
 pycountry>=23.12.11
 
-# scapy<2.5.0 will not work with python3.12
-scapy>=2.5.0
+# scapy==2.6.0 causes CI failures due to a race condition
+scapy>=2.6.1
 
 # tuf isn't updated to deal with breaking changes in securesystemslib==1.0.
 # Only tuf>=4 includes a constraint to <1.0.
diff --git a/tests/components/dhcp/conftest.py b/tests/components/dhcp/conftest.py
deleted file mode 100644
index b0fa3f573c5069..00000000000000
--- a/tests/components/dhcp/conftest.py
+++ /dev/null
@@ -1,21 +0,0 @@
-"""Tests for the dhcp integration."""
-
-import os
-import pathlib
-
-
-def pytest_sessionstart(session):
-    """Try to avoid flaky FileExistsError in CI.
-
-    Called after the Session object has been created and
-    before performing collection and entering the run test loop.
-
-    This is needed due to a race condition in scapy v2.6.0
-    See https://github.com/secdev/scapy/pull/4558
-
-    Can be removed when scapy 2.6.1 is released.
-    """
-    for sub_dir in (".cache", ".config"):
-        path = pathlib.Path(os.path.join(os.path.expanduser("~"), sub_dir))
-        if not path.exists():
-            path.mkdir(mode=0o700, exist_ok=True)