Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/topic/timw/python-upgrade'
Browse files Browse the repository at this point in the history
* origin/topic/timw/python-upgrade:
  Fix ruff F findings
  Fix ruff UP findings
  Fix ruff C4 findings
  Add ruff linting for python, fix I/ISC issues
  Add pre-commit run ruff-format, fix findings
  Remove long-obsolete travis.yml file
  CI: Install python3.9-dev on ubuntu 20
  Require Python 3.9 in CMakeLists.txt
  • Loading branch information
timwoj committed Dec 11, 2024
2 parents 28cdb75 + 9ad0642 commit 222571c
Show file tree
Hide file tree
Showing 28 changed files with 689 additions and 527 deletions.
7 changes: 7 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,10 @@ repos:
rev: 'v19.1.3'
hooks:
- id: clang-format

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.8.1
hooks:
- id: ruff-format
- id: ruff
args: [--fix]
34 changes: 0 additions & 34 deletions .travis.yml

This file was deleted.

18 changes: 18 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
2.8.0-dev.163 | 2024-12-10 17:27:21 -0700

* Fix ruff F findings (Tim Wojtulewicz, Corelight)

* Fix ruff UP findings (Tim Wojtulewicz, Corelight)

* Fix ruff C4 findings (Tim Wojtulewicz, Corelight)

* Add ruff linting for python, fix I/ISC issues (Tim Wojtulewicz, Corelight)

* Add pre-commit run ruff-format, fix findings (Tim Wojtulewicz, Corelight)

* Remove long-obsolete travis.yml file (Tim Wojtulewicz, Corelight)

* CI: Install python3.9-dev on ubuntu 20 (Tim Wojtulewicz, Corelight)

* Require Python 3.9 in CMakeLists.txt (Tim Wojtulewicz, Corelight)

2.8.0-dev.154 | 2024-12-06 15:14:02 -0800

* Fix potential connector infinite loop in read_result::stop scenarios (Christian Kreibich, Corelight)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ endif ()

if (NOT DISABLE_PYTHON_BINDINGS)
set(Python_ADDITIONAL_VERSIONS 3)
find_package(Python 3.5 COMPONENTS Interpreter Development)
find_package(Python 3.9 COMPONENTS Interpreter Development)

if (NOT Python_FOUND)
message(STATUS "Skipping Python bindings: Python interpreter not found")
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.8.0-dev.154
2.8.0-dev.163
Loading

0 comments on commit 222571c

Please sign in to comment.