From 5bfb7f5d3c7d79426275acb4cf5f8ce570fca974 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Tue, 3 Dec 2024 13:28:10 -0700
Subject: [PATCH 1/2] Upgrade python requirement to 3.9

---
 .github/workflows/btest.yml | 4 ++--
 README                      | 3 +--
 pyproject.toml              | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/btest.yml b/.github/workflows/btest.yml
index b34480a..6cf75ab 100644
--- a/.github/workflows/btest.yml
+++ b/.github/workflows/btest.yml
@@ -12,7 +12,7 @@ jobs:
   Run-BTest:
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
         os: [macos-latest, ubuntu-latest, windows-latest]
 
     runs-on: ${{ matrix.os }}
@@ -53,7 +53,7 @@ jobs:
   Test-SetupPY:
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
         os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}
diff --git a/README b/README
index d272836..36f9775 100644
--- a/README
+++ b/README
@@ -27,8 +27,7 @@ Prerequisites
 
 BTest has the following prerequisites:
 
-- Python version >= 3.7 (older versions may work, but are not
-  well-tested).
+- Python version >= 3.9 (older versions may work, but are not well-tested).
 
 - Bash. Note that on FreeBSD and Alpine Linux, bash is not installed by
   default. This is also required on Windows, in the form of Git's msys2, Cygwin,
diff --git a/pyproject.toml b/pyproject.toml
index cd3d1b5..efecf8e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ dynamic = ["version"]
 
 license = { text = "3-clause BSD License" }
 
-requires-python = ">=3.7"
+requires-python = ">=3.9"
 
 keywords=[
     "system",

From ee691ac929ebaba2cbc93a9121ca49d57f13e25c Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Tue, 3 Dec 2024 15:26:14 -0700
Subject: [PATCH 2/2] Fix ruff UP check findings

---
 sphinx/btest-sphinx.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sphinx/btest-sphinx.py b/sphinx/btest-sphinx.py
index d6f1d31..8a4d5a1 100644
--- a/sphinx/btest-sphinx.py
+++ b/sphinx/btest-sphinx.py
@@ -109,7 +109,7 @@ def apply(self):
             BTestTransform._run.add(test.tag)
 
         try:
-            rawtext = open("%s#%d" % (test.rst_output, part)).read()
+            rawtext = open(f"{test.rst_output}#{part}").read()
         except OSError:
             rawtext = ""
 
@@ -162,7 +162,7 @@ def run(self):
         if part == 1:
             file = test.path
         else:
-            file = test.path + "#%d" % part
+            file = f"{test.path}#{part}"
 
         out = open(file, "w")
         for line in self.content:
@@ -247,7 +247,7 @@ def run(self):
         while test_path in Includes:
             i += 1
 
-            test_path = "%s@%d" % (base, i)
+            test_path = f"{base}@{i}"
             if ext:
                 test_path += ext