Skip to content

Commit

Permalink
Prepare Release (#12)
Browse files Browse the repository at this point in the history
* prepare release
  • Loading branch information
carlmontanari authored Jul 30, 2021
1 parent 3f29efd commit df12476
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
max-parallel: 12
matrix:
os: [ubuntu-latest, macos-latest]
version: [3.6, 3.7, 3.8, 3.9, 3.10.0-beta.1]
version: [3.6, 3.7, 3.8, 3.9, 3.10.0-beta.4]
steps:
- uses: actions/checkout@v2
- name: set up python ${{ matrix.version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/weekly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
max-parallel: 12
matrix:
os: [ubuntu-latest, macos-latest]
version: [3.6, 3.7, 3.8, 3.9, 3.10.0-beta.1]
version: [3.6, 3.7, 3.8, 3.9, 3.10.0-beta.4]
steps:
- uses: actions/checkout@v2
- name: set up python ${{ matrix.version }}
Expand Down
1 change: 1 addition & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
site_name: Scrapli Replay
site_description: Tools to enable easy testing of scrapli programs
site_author: Carl Montanari
site_url: https://scrapli.github.io/

repo_name: scrapli/scrapli_replay
repo_url: https://github.com/scrapli/scrapli_replay
Expand Down
14 changes: 7 additions & 7 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
black==21.5b1
black==21.7b0
darglint==1.8.0
isort==5.8.0
mypy==0.812
nox==2020.12.31
isort==5.9.3
mypy==0.910
nox==2021.6.12
pycodestyle==2.7.0
pydocstyle==6.1.1
pyfakefs==4.4.0
pyfakefs==4.5.0
pylama==7.7.1
pylint==2.8.2
pylint==2.9.6
pytest-asyncio==0.15.1
pytest-cov==2.12.0
pytest-cov==2.12.1
pytest==6.2.4
-r requirements.txt
4 changes: 2 additions & 2 deletions requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mdx-gh-links==0.2
mkdocs==1.1.2
mkdocs-material==7.1.5
mkdocs==1.2.2
mkdocs-material==7.2.1
mkdocs-material-extensions==1.0.1
pdoc3==0.9.2 ; sys_platform != "win32"
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
asyncssh==2.6.0
asyncssh>=2.2.1,<3.0.0
dataclasses>=0.7,<1.0 ; python_version < "3.7"
ruamel.yaml==0.17.4
ruamel.yaml>=0.17,<0.18
scrapli>=2021.07.30a3
11 changes: 6 additions & 5 deletions scrapli_replay/replay/replay.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from unittest import mock

import pytest
from ruamel.yaml import YAML, safe_load # type: ignore
import ruamel.yaml

import scrapli
from scrapli.channel.async_channel import AsyncChannel
Expand All @@ -28,6 +28,8 @@
ScrapliReplayExpectedInputError,
)

YAML = ruamel.yaml.YAML(typ="safe", pure=True) # type: ignore

# used to replace scrapli cfg session name/id in channel write log
SCRAPLI_CFG_SESSION_PATTERN = re.compile(pattern=r"scrapli_cfg_\d+")

Expand Down Expand Up @@ -615,7 +617,7 @@ def __init__(
self.replay_session: Dict[str, Any] = {}
if self.replay_mode == ReplayMode.REPLAY:
with open(f"{self.session_directory}/{self.session_name}.yaml", "r") as f:
self.replay_session = safe_load(f)
self.replay_session = YAML.load(f)
# if we open a session and there are no interactions recorded for any of the hosts then
# something is not right -- we will need to re-record a session
if not all(
Expand Down Expand Up @@ -1077,6 +1079,5 @@ def _save(self) -> None:
"""
with open(f"{self.session_directory}/{self.session_name}.yaml", "w") as f:
yaml = YAML()
yaml.indent(mapping=2, sequence=4, offset=2)
yaml.dump(self._serialize(), f)
YAML.indent(mapping=2, sequence=4, offset=2)
YAML.dump(self._serialize(), f)
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import setuptools

__version__ = "2021.07.30a5"
__version__ = "2021.07.30"
__author__ = "Carl Montanari"

with open("README.md", "r", encoding="utf-8") as f:
Expand Down

0 comments on commit df12476

Please sign in to comment.