Adjust minimum scapy version to 2.6.1 (#130565)

This commit is contained in:
epenet 2024-11-14 00:49:39 +01:00 committed by GitHub
parent 51c6ee97b1
commit 6a3b4a6a23
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 25 deletions

View file

@ -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.

View file

@ -214,8 +214,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.

View file

@ -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)