Skip to content

Commit

Permalink
Merge branch 'main' into feat/BFD
Browse files Browse the repository at this point in the history
  • Loading branch information
gmuloc authored Nov 26, 2024
2 parents fb5b383 + 1edbf9c commit 93ce62f
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ repos:
- '<!--| ~| -->'

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.7.4
rev: v0.8.0
hooks:
- id: ruff
name: Run Ruff linter
Expand Down Expand Up @@ -100,7 +100,7 @@ repos:
files: ^(anta|tests)/

- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.42.0
rev: v0.43.0
hooks:
- id: markdownlint
name: Check Markdown files style.
Expand Down
2 changes: 1 addition & 1 deletion anta/cli/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def wrap() -> None:

cli = build_cli(exc)

__all__ = ["cli", "anta"]
__all__ = ["anta", "cli"]

if __name__ == "__main__":
cli()
2 changes: 1 addition & 1 deletion anta/result_manager/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def _update_status(self, test_status: AntaTestStatus) -> None:
if test_status == "error":
self.error_status = True
return
if self.status == "unset" or self.status == "skipped" and test_status in {"success", "failure"}:
if self.status == "unset" or (self.status == "skipped" and test_status in {"success", "failure"}):
self.status = test_status
elif self.status == "success" and test_status == "failure":
self.status = AntaTestStatus.FAILURE
Expand Down
12 changes: 4 additions & 8 deletions anta/tests/field_notices.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,11 @@ def test(self) -> None:

self.result.is_success()
incorrect_aboot_version = (
aboot_version.startswith("4.0.")
and int(aboot_version.split(".")[2]) < 7
or aboot_version.startswith("4.1.")
and int(aboot_version.split(".")[2]) < 1
(aboot_version.startswith("4.0.") and int(aboot_version.split(".")[2]) < 7)
or (aboot_version.startswith("4.1.") and int(aboot_version.split(".")[2]) < 1)
or (
aboot_version.startswith("6.0.")
and int(aboot_version.split(".")[2]) < 9
or aboot_version.startswith("6.1.")
and int(aboot_version.split(".")[2]) < 7
(aboot_version.startswith("6.0.") and int(aboot_version.split(".")[2]) < 9)
or (aboot_version.startswith("6.1.") and int(aboot_version.split(".")[2]) < 7)
)
)
if incorrect_aboot_version:
Expand Down
2 changes: 1 addition & 1 deletion asynceapi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
from .device import Device
from .errors import EapiCommandError

__all__ = ["Device", "SessionConfig", "EapiCommandError"]
__all__ = ["Device", "EapiCommandError", "SessionConfig"]
1 change: 1 addition & 0 deletions docs/api/tests.routing.isis.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ anta_title: ANTA catalog for IS-IS tests
-->

::: anta.tests.routing.isis

options:
show_root_heading: false
show_root_toc_entry: false
Expand Down
1 change: 1 addition & 0 deletions docs/api/tests.routing.ospf.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ anta_title: ANTA catalog for OSPF tests
-->

::: anta.tests.routing.ospf

options:
show_root_heading: false
show_root_toc_entry: false
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ dev = [
"pytest-metadata>=3.0.0",
"pytest>=7.4.0",
"respx>=0.21.1",
"ruff>=0.5.4,<0.8.0",
"ruff>=0.5.4,<0.9.0",
"tox>=4.10.0,<5.0.0",
"types-PyYAML",
"types-pyOpenSSL",
Expand Down
2 changes: 1 addition & 1 deletion tests/units/reporter/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@

from tests.units.result_manager.conftest import list_result_factory, result_manager, result_manager_factory, test_result_factory

__all__ = ["result_manager", "result_manager_factory", "list_result_factory", "test_result_factory"]
__all__ = ["list_result_factory", "result_manager", "result_manager_factory", "test_result_factory"]

0 comments on commit 93ce62f

Please sign in to comment.