Skip to content

Commit

Permalink
chore: update pins and re-blacken
Browse files Browse the repository at this point in the history
  • Loading branch information
carlmontanari committed Apr 9, 2024
1 parent 72bcd82 commit 158aa3e
Show file tree
Hide file tree
Showing 39 changed files with 50 additions and 10 deletions.
1 change: 1 addition & 0 deletions docs/generate.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Generate the code reference pages and navigation."""

from pathlib import Path

import mkdocs_gen_files
Expand Down
1 change: 1 addition & 0 deletions examples/basic_usage/config_replace.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.examples.basic_usage.config_replace"""

from scrapli import Scrapli
from scrapli_cfg import ScrapliCfg

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.examples.basic_usage.eos_selective_config_replace"""

from scrapli import Scrapli
from scrapli_cfg.platform.core.arista_eos import ScrapliCfgEOS
from scrapli_cfg.platform.core.arista_eos.patterns import ETHERNET_INTERFACES
Expand Down
1 change: 1 addition & 0 deletions noxfile.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.noxfile"""

import re
import sys
from pathlib import Path
Expand Down
6 changes: 3 additions & 3 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
black>=23.3.0,<24.0.0
black>=23.3.0,<25.0.0
darglint>=1.8.1,<2.0.0
isort>=5.10.1,<6.0.0
mypy>=1.4.1,<2.0.0
nox==2023.4.22
nox==2024.3.2
pycodestyle>=2.8.0,<3.0.0
pydocstyle>=6.1.1,<7.0.0
pyfakefs>=5.0.0,<6.0.0
pyfakefs>=5.0.0,<5.4.0
pylama>=8.4.0,<9.0.0
pylint>=3.0.0,<4.0.0
pytest-asyncio>=0.17.0,<1.0.0
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg"""

from scrapli_cfg.factory import AsyncScrapliCfg, ScrapliCfg

__version__ = "2024.01.30"
Expand Down
17 changes: 10 additions & 7 deletions scrapli_cfg/diff.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.diff"""

import difflib
import shutil
from typing import List, Tuple
Expand Down Expand Up @@ -205,13 +206,15 @@ def unified_diff(self) -> str:
yellow, red, green, end = self._generate_colors()

unified_diff = [
yellow + line[2:] + end
if line[:2] == "? "
else red + line[2:] + end
if line[:2] == "- "
else green + line[2:] + end
if line[:2] == "+ "
else line[2:]
(
yellow + line[2:] + end
if line[:2] == "? "
else (
red + line[2:] + end
if line[:2] == "- "
else green + line[2:] + end if line[:2] == "+ " else line[2:]
)
)
for line in self._difflines
]
joined_unified_diff = "".join(unified_diff)
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/exceptions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.exceptions"""

from scrapli.exceptions import ScrapliException


Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/factory.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.factory"""

from typing import TYPE_CHECKING, Any, Callable, List, Optional

from scrapli.driver.core import (
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/logging.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.logging"""

from logging import FileHandler, NullHandler, getLogger
from typing import Union

Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/base/async_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.async_platform"""

from abc import ABC, abstractmethod
from types import TracebackType
from typing import Any, Callable, List, Optional, Pattern, Tuple, Type
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/base/base_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platforms.base_platform"""

import re
from typing import List, Pattern, Tuple, Union

Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/base/sync_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.sync_platform"""

from abc import ABC, abstractmethod
from types import TracebackType
from typing import Any, Callable, List, Optional, Pattern, Tuple, Type
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/arista_eos/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.arista_eos"""

from scrapli_cfg.platform.core.arista_eos.async_platform import AsyncScrapliCfgEOS
from scrapli_cfg.platform.core.arista_eos.sync_platform import ScrapliCfgEOS

Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/arista_eos/async_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.arista_eos.async_platform"""

from typing import Any, Callable, List, Optional

from scrapli.driver.core import AsyncEOSDriver
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/arista_eos/base_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.arista_eos.base"""

import json
import re
from datetime import datetime
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/arista_eos/patterns.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.arista_eos.patterns"""

import re

VERSION_PATTERN = re.compile(pattern=r"\d+\.\d+\.[a-z0-9\-]+(\.\d+[a-z]{0,1})?", flags=re.I)
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/arista_eos/sync_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.arista_eos.sync"""

from typing import Any, Callable, List, Optional

from scrapli.driver.core import EOSDriver
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/cisco_iosxe/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.cisco_iosxe"""

from scrapli_cfg.platform.core.cisco_iosxe.async_platform import AsyncScrapliCfgIOSXE
from scrapli_cfg.platform.core.cisco_iosxe.sync_platform import ScrapliCfgIOSXE

Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/cisco_iosxe/async_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.cisco_iosxe.async_platform"""

from typing import Any, Callable, List, Optional

from scrapli.driver import AsyncNetworkDriver
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/cisco_iosxe/base_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.cisco_iosxe.base"""

import re
from datetime import datetime
from enum import Enum
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/cisco_iosxe/patterns.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.cisco_iosxe.patterns"""

import re

VERSION_PATTERN = re.compile(pattern=r"\d+\.[a-z0-9\(\)\.]+", flags=re.I)
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/cisco_iosxe/sync_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.cisco_iosxe.sync_platform"""

from typing import Any, Callable, List, Optional

from scrapli.driver import NetworkDriver
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/cisco_iosxr/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.cisco_iosxr"""

from scrapli_cfg.platform.core.cisco_iosxr.async_platform import AsyncScrapliCfgIOSXR
from scrapli_cfg.platform.core.cisco_iosxr.sync_platform import ScrapliCfgIOSXR

Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/cisco_iosxr/async_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.cisco_iosxr.async_platform"""

from typing import Any, Callable, List, Optional, Union

from scrapli.driver import AsyncNetworkDriver
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/cisco_iosxr/base_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.cisco_iosxr.base_platform"""

import re
from logging import Logger, LoggerAdapter
from typing import TYPE_CHECKING, Tuple
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/cisco_iosxr/patterns.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.cisco_iosxr.patterns"""

import re

VERSION_PATTERN = re.compile(pattern=r"\d+\.\d+\.\d+", flags=re.I)
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/cisco_iosxr/sync_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.cisco_iosxr.sync_platform"""

from typing import Any, Callable, List, Optional, Union

from scrapli.driver import NetworkDriver
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/cisco_nxos/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.cisco_nxos"""

from scrapli_cfg.platform.core.cisco_nxos.async_platform import AsyncScrapliCfgNXOS
from scrapli_cfg.platform.core.cisco_nxos.sync_platform import ScrapliCfgNXOS

Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/cisco_nxos/async_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.cisco_nxos.async_platform"""

from typing import Any, Callable, List, Optional, Union

from scrapli.driver.core import AsyncNXOSDriver
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/cisco_nxos/base_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.cisco_nxos.base_platform"""

import re
from datetime import datetime
from logging import Logger, LoggerAdapter
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/cisco_nxos/patterns.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platforms.cisco_nxos.patterns"""

import re

VERSION_PATTERN = re.compile(pattern=r"\d+\.[a-z0-9\(\)\.]+", flags=re.I)
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/cisco_nxos/sync_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.cisco_nxos.sync_platform"""

from typing import Any, Callable, List, Optional, Union

from scrapli.driver.core import NXOSDriver
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/juniper_junos/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.juniper_junos"""

from scrapli_cfg.platform.core.juniper_junos.async_platform import AsyncScrapliCfgJunos
from scrapli_cfg.platform.core.juniper_junos.sync_platform import ScrapliCfgJunos

Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/juniper_junos/async_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.juniper_junos.async_platform"""

from typing import Any, Callable, List, Optional

from scrapli.driver import AsyncNetworkDriver
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/juniper_junos/base_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.juniper_junos.base_platform"""

import re
from datetime import datetime
from logging import Logger, LoggerAdapter
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/juniper_junos/patterns.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.juniper_junos.patterns"""

import re

VERSION_PATTERN = re.compile(
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/platform/core/juniper_junos/sync_platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.platform.core.juniper_junos.sync_platform"""

from typing import Any, Callable, List, Optional

from scrapli.driver import NetworkDriver
Expand Down
1 change: 1 addition & 0 deletions scrapli_cfg/response.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""scrapli_cfg.response"""

from datetime import datetime
from typing import Iterable, List, Optional, Type, Union

Expand Down

0 comments on commit 158aa3e

Please sign in to comment.