Merge remote-tracking branch 'origin/topic/timw/python-upgrade'

* origin/topic/timw/python-upgrade:
  Fix ruff UP check findings
  Upgrade python requirement to 3.9

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

CHANGES

@@ -1,3 +1,9 @@
+1.1-20 | 2024-12-04 08:46:27 -0700
+
+  * Fix ruff UP check findings (Tim Wojtulewicz, Corelight)
+
+  * Upgrade python requirement to 3.9 (Tim Wojtulewicz, Corelight)
+
 1.1-17 | 2024-07-31 14:15:38 +0200
 
   * ci: Drop python-3.7, add python-3.12 (Benjamin Bannier, Corelight)

README

@@ -2,7 +2,7 @@
 ..
 .. Version number is filled in automatically.
 
-.. |version| replace:: 1.1-17
+.. |version| replace:: 1.1-20
 
 ==================================================
 BTest - A Generic Driver for Powerful System Tests
@@ -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,

VERSION

@@ -1 +1 @@
-1.1-17
+1.1-20

btest

@@ -56,7 +56,7 @@ else:
     import multiprocessing.managers as mp_managers
     import multiprocessing.sharedctypes as mp_sharedctypes
 
-VERSION = "1.1-17"  # Automatically filled in.
+VERSION = "1.1-20"  # Automatically filled in.
 
 Name = "btest"
 Config = None

pyproject.toml

@@ -9,7 +9,7 @@ dynamic = ["version"]
 
 license = { text = "3-clause BSD License" }
 
-requires-python = ">=3.7"
+requires-python = ">=3.9"
 
 keywords=[
     "system",

setup.py

@@ -5,6 +5,6 @@
 py_modules = ["btest-sphinx"]
 
 setup(
-    version="1.1.dev17",  # Filled in automatically.
+    version="1.1.dev20",  # Filled in automatically.
     py_modules=py_modules,
 )

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