Skip to content

Commit

Permalink
Merge branch 'topic/timw/update-pre-commit-versions'
Browse files Browse the repository at this point in the history
* topic/timw/update-pre-commit-versions:
  Update versions for pre-commit hooks
  • Loading branch information
timwoj committed Dec 10, 2024
2 parents fd29b19 + 71c638d commit ab6aff8
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
exclude: testing/baselines
Expand All @@ -11,7 +11,7 @@ repos:
- id: check-yaml
- id: check-added-large-files
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.5.2
rev: v0.8.2
hooks:
- id: ruff
args: [--fix]
Expand Down
4 changes: 4 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
3.0.1-43 | 2024-12-10 12:21:04 -0700

* Update versions for pre-commit hooks (Tim Wojtulewicz, Corelight)

3.0.1-41 | 2024-09-10 10:36:13 +0200

* Fix UnicodeEncodeError in `zkg create` with non-ASCII characters in user vars (Fupeng Zhao)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.1-41
3.0.1-43
2 changes: 1 addition & 1 deletion doc/man/zkg.1
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
.TH "ZKG" "1" "Sep 10, 2024" "3.0.1-41" "Zeek Package Manager"
.TH "ZKG" "1" "Dec 10, 2024" "3.0.1-43" "Zeek Package Manager"
.SH NAME
zkg \- Zeek Package Manager
.sp
Expand Down
2 changes: 1 addition & 1 deletion zeekpkg/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import logging

__version__ = "3.0.1-41"
__version__ = "3.0.1-43"
__all__ = ["manager", "package", "source", "template", "uservar"] # noqa: F405

LOG = logging.getLogger(__name__)
Expand Down
4 changes: 2 additions & 2 deletions zeekpkg/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2068,8 +2068,8 @@ def __str__(self):
continue

# Suggestion status propagates to 'depends' field of suggested packages.
is_suggestion = (
node.is_suggestion or dep_name in ds and dep_name not in dd
is_suggestion = node.is_suggestion or (
dep_name in ds and dep_name not in dd
)

# If a dependency can be fulfilled by a built-in package
Expand Down

0 comments on commit ab6aff8

Please sign in to comment.