Skip to content

Commit

Permalink
Merge pull request #118 from netdevops/build-2.2.3
Browse files Browse the repository at this point in the history
Resolve 2.2.3 Build
  • Loading branch information
jtdub authored Jan 8, 2024
2 parents b1e23a2 + 1b21448 commit e70bac6
Show file tree
Hide file tree
Showing 7 changed files with 581 additions and 694 deletions.
2 changes: 2 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[flake8]
ignore = E501,W503,E203,F401
1 change: 1 addition & 0 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ jobs:
poetry install --no-interaction --no-root
poetry run mypy hier_config
poetry run pylint --rcfile=pylintrc hier_config
poetry run flake8 .
poetry run pytest
2 changes: 1 addition & 1 deletion hier_config/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def add_child(
self.logs.append(f"Found a duplicate section: {list(self.path()) + [text]}")
return self.children_dict[text]

def path(self) -> Iterator[str]: # pylint: disable=no-self-use
def path(self) -> Iterator[str]:
yield from ()

def add_deep_copy_of(
Expand Down
8 changes: 4 additions & 4 deletions hier_config/host.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ class Host:
host.remediation_config_filtered_text({"safe"}, set()})
"""

def __init__(
def __init__( # pylint: disable=dangerous-default-value
self,
hostname: str,
os: str,
hconfig_options: dict = None,
hconfig_options: dict = {},
):
self.hostname = hostname
self.os = os
Expand Down Expand Up @@ -175,8 +175,8 @@ def _load_from_file(name: str, parse_yaml: bool = False) -> Union[list, dict, st

return content

def _get_running_config(self) -> HConfig: # pylint: disable=no-self-use
def _get_running_config(self) -> HConfig:
return NotImplemented

def _get_generated_config(self) -> HConfig: # pylint: disable=no-self-use
def _get_generated_config(self) -> HConfig:
return NotImplemented
1,233 changes: 560 additions & 673 deletions poetry.lock

Large diffs are not rendered by default.

24 changes: 13 additions & 11 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "hier-config"
version = "2.2.2"
version = "2.2.3"
description = "A network configuration comparison tool, used to build remediation configurations."
packages = [
{ include="hier_config", from="."},
Expand All @@ -26,19 +26,21 @@ classifiers = [
"Topic :: System :: Networking",
]
[tool.poetry.dependencies]
python = "^3.8"
python = ">=3.8.1,<4.0"
PyYAML = ">= 5.4"
types-pyyaml = "^6.0.12.12"

[tool.poetry.dev-dependencies]
pytest = "^6.2.3"
mypy = "^0.812"
pylint = "^2.7.4"
pytest-cov = "^2.11.1"
[tool.poetry.group.dev.dependencies]
black = "^23.12.1"
flake8 = "^7.0.0"
pytest = "^7.4.4"
mypy = "^1.8.0"
pylint = "^3.0.3"
pytest-cov = "^4.1.0"
pytest-black = "^0.3.12"
pytest-runner = "^5.3.0"
pytest-flake8 = "^1.0.7"
mkdocs = "^1.2.2"
mkdocs-include-markdown-plugin = "^3.2.3"
pytest-runner = "^6.0.1"
mkdocs = "^1.5.3"
mkdocs-include-markdown-plugin = "^6.0.4"

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down
5 changes: 0 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,9 @@ addopts =
-vv
--cov=hier_config --cov-fail-under=75 --cov-report=term-missing
--black
--flake8
; --pylint --pylint-ignore=tests
; --mypy

[flake8]
ignore = E501,W503,E203,F401


;[mypy]
;python_version = 3.8
;warn_unused_configs = True
Expand Down

0 comments on commit e70bac6

Please sign in to comment.