Merge remote-tracking branch 'origin/topic/timw/unify-python-pre-comm…

…its'

* origin/topic/timw/unify-python-pre-commits:
  Standardize on ruff for python formatting/linting via pre-commits

.pre-commit-config.yaml

@@ -22,20 +22,17 @@ repos:
   - id: end-of-file-fixer
     exclude: ^testing/Baseline|examples/.*Baseline.*
 
-- repo: https://github.com/psf/black
-  rev: 23.7.0
-  hooks:
-  - id: black
-
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.10.1
+  rev: v3.15.1
   hooks:
   - id: pyupgrade
     args: ["--py37-plus"]
 
-- repo: https://github.com/pycqa/flake8
-  rev: 6.1.0  # 6.0.0 requires Python 3.8
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.3.0
   hooks:
-  - id: flake8
+    - id: ruff
+      args: [--fix]
+    - id: ruff-format
 
 exclude: examples/sphinx/conf.py

CHANGES

@@ -1,3 +1,7 @@
+1.1-8 | 2024-04-10 09:35:28 -0700
+
+  * Standardize on ruff for python formatting/linting via pre-commits (Tim Wojtulewicz, Corelight)
+
 1.1-6 | 2024-01-09 09:16:00 +0100
 
   * Add option to read lists of tests from file. (Robin Sommer)

README

@@ -2,7 +2,7 @@
 ..
 .. Version number is filled in automatically.
 
-.. |version| replace:: 1.1-6
+.. |version| replace:: 1.1-8
 
 ==================================================
 BTest - A Generic Driver for Powerful System Tests

VERSION

@@ -1 +1 @@
-1.1-6
+1.1-8

btest

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

setup.py

@@ -31,7 +31,7 @@
 
 setup(
     name="btest",
-    version="1.1.dev4",  # Filled in automatically.
+    version="1.1.dev8",  # Filled in automatically.
     description="A powerful system testing framework",
     long_description="See https://github.com/zeek/btest",
     author="The Zeek Team",