Skip to content

Commit 8e8a51a

Browse files
committed
Merge branch 'topic/bbannier/pyproject-config'
2 parents 989c751 + c31e6a4 commit 8e8a51a

File tree

11 files changed

+191
-157
lines changed

11 files changed

+191
-157
lines changed

.github/workflows/btest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
Run-BTest:
1313
strategy:
1414
matrix:
15-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
15+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
1616
os: [macos-latest, ubuntu-latest, windows-latest]
1717

1818
runs-on: ${{ matrix.os }}
@@ -53,7 +53,7 @@ jobs:
5353
Test-SetupPY:
5454
strategy:
5555
matrix:
56-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
56+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
5757
os: [ubuntu-latest]
5858

5959
runs-on: ${{ matrix.os }}

.pre-commit-config.yaml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,28 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
44
- repo: https://github.com/shellcheck-py/shellcheck-py
5-
rev: v0.9.0.5
5+
rev: v0.10.0.1
66
hooks:
77
- id: shellcheck
88
exclude: examples/|testing/tests/.*\.sh
99

1010
- repo: https://github.com/maxwinterstein/shfmt-py
11-
rev: v3.4.3.1
11+
rev: v3.7.0.1
1212
hooks:
1313
- id: shfmt
1414
exclude: examples/t6.sh
1515
args: ["-w", "-i", "4", "-ci"]
1616

1717
- repo: https://github.com/pre-commit/pre-commit-hooks
18-
rev: v4.4.0
18+
rev: v4.6.0
1919
hooks:
2020
- id: trailing-whitespace
2121
exclude: ^testing/Baseline
2222
- id: end-of-file-fixer
2323
exclude: ^testing/Baseline|examples/.*Baseline.*
2424

25-
- repo: https://github.com/asottile/pyupgrade
26-
rev: v3.15.1
27-
hooks:
28-
- id: pyupgrade
29-
args: ["--py37-plus"]
30-
3125
- repo: https://github.com/astral-sh/ruff-pre-commit
32-
rev: v0.3.0
26+
rev: v0.5.5
3327
hooks:
3428
- id: ruff
3529
args: [--fix]

CHANGES

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
1.1-17 | 2024-07-31 14:15:38 +0200
2+
3+
* ci: Drop python-3.7, add python-3.12 (Benjamin Bannier, Corelight)
4+
5+
Even though python-3.7 remains our minimal Python version it is not
6+
support by GH actions anymore so this commit drops it from CI. We also
7+
add a setup for the now released python-3.12.
8+
9+
* Activate flake8-implicit-str-concat linter (Benjamin Bannier, Corelight)
10+
11+
* Activate isort linter (Benjamin Bannier, Corelight)
12+
13+
* Activate pyflakes linter (Benjamin Bannier, Corelight)
14+
15+
We previously linted with flake8 so this contains no code changes.
16+
17+
* Active linter for style around comprehensions (Benjamin Bannier, Corelight)
18+
19+
* Use ruff for pyupgrade functionality (Benjamin Bannier, Corelight)
20+
21+
* Move project configuration to `pyproject.toml` (Benjamin Bannier, Corelight)
22+
23+
This centralizes most project configuration from `setup.py` and
24+
`setup.cfg` into the existing `pyproject.toml` so it can be picked up by
25+
more tools.
26+
27+
* Bump pre-commit hooks (Benjamin Bannier, Corelight)
28+
129
1.1-8 | 2024-04-10 09:35:28 -0700
230

331
* Standardize on ruff for python formatting/linting via pre-commits (Tim Wojtulewicz, Corelight)

README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
..
33
.. Version number is filled in automatically.
44

5-
.. |version| replace:: 1.1-8
5+
.. |version| replace:: 1.1-17
66

77
==================================================
88
BTest - A Generic Driver for Powerful System Tests

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1-8
1+
1.1-17

0 commit comments

Comments
 (0)