Merge branch 'topic/bbannier/pyproject-config'

zeek · Jul 31, 2024 · 8e8a51a · 8e8a51a
2 parents 989c751 + c31e6a4
commit 8e8a51a
Show file tree

Hide file tree

Showing 11 changed files with 191 additions and 157 deletions.
diff --git a/.github/workflows/btest.yml b/.github/workflows/btest.yml
@@ -12,7 +12,7 @@ jobs:
   Run-BTest:
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "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.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,34 +2,28 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 - repo: https://github.com/shellcheck-py/shellcheck-py
-  rev: v0.9.0.5
+  rev: v0.10.0.1
   hooks:
   - id: shellcheck
     exclude: examples/|testing/tests/.*\.sh
 
 - repo: https://github.com/maxwinterstein/shfmt-py
-  rev: v3.4.3.1
+  rev: v3.7.0.1
   hooks:
   - id: shfmt
     exclude: examples/t6.sh
     args: ["-w", "-i", "4", "-ci"]
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v4.6.0
   hooks:
   - id: trailing-whitespace
     exclude: ^testing/Baseline
   - id: end-of-file-fixer
     exclude: ^testing/Baseline|examples/.*Baseline.*
 
-- repo: https://github.com/asottile/pyupgrade
-  rev: v3.15.1
-  hooks:
-  - id: pyupgrade
-    args: ["--py37-plus"]
-
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.3.0
+  rev: v0.5.5
   hooks:
     - id: ruff
       args: [--fix]

diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,31 @@
+1.1-17 | 2024-07-31 14:15:38 +0200
+
+  * ci: Drop python-3.7, add python-3.12 (Benjamin Bannier, Corelight)
+
+    Even though python-3.7 remains our minimal Python version it is not
+    support by GH actions anymore so this commit drops it from CI. We also
+    add a setup for the now released python-3.12.
+
+  * Activate flake8-implicit-str-concat linter (Benjamin Bannier, Corelight)
+
+  * Activate isort linter (Benjamin Bannier, Corelight)
+
+  * Activate pyflakes linter (Benjamin Bannier, Corelight)
+
+    We previously linted with flake8 so this contains no code changes.
+
+  * Active linter for style around comprehensions (Benjamin Bannier, Corelight)
+
+  * Use ruff for pyupgrade functionality (Benjamin Bannier, Corelight)
+
+  * Move project configuration to `pyproject.toml` (Benjamin Bannier, Corelight)
+
+    This centralizes most project configuration from `setup.py` and
+    `setup.cfg` into the existing `pyproject.toml` so it can be picked up by
+    more tools.
+
+  * Bump pre-commit hooks (Benjamin Bannier, Corelight)
+
 1.1-8 | 2024-04-10 09:35:28 -0700
 
   * Standardize on ruff for python formatting/linting via pre-commits (Tim Wojtulewicz, Corelight)

diff --git a/README b/README
@@ -2,7 +2,7 @@
 ..
 .. Version number is filled in automatically.
 
-.. |version| replace:: 1.1-8
+.. |version| replace:: 1.1-17
 
 ==================================================
 BTest - A Generic Driver for Powerful System Tests

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1-8
+1.1-17