Skip to content

Commit

Permalink
Merge pull request #248 from carlmontanari/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
carlmontanari authored Jul 30, 2022
2 parents fa2277e + 4813711 commit 3ca5894
Show file tree
Hide file tree
Showing 599 changed files with 21,543 additions and 5,849 deletions.
39 changes: 39 additions & 0 deletions .clab/topo.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
name: scrapli

topology:
kinds:
vr-csr:
image: boxen_cisco_csr1000v:16.12.03
vr-xrv9k:
image: boxen_cisco_xrv9k:6.5.3
vr-n9kv:
image: boxen_cisco_n9kv:9.2.4
ceos:
image: ceos:4.28.0F
vr-vqfx:
image: boxen_juniper_vsrx:17.3R2.10
nodes:
vr-csr:
kind: vr-csr
mgmt_ipv4: 172.20.20.11
mgmt_ipv6: 2001:172:20:20::11
vr-xrv9k:
kind: vr-xrv9k
mgmt_ipv4: 172.20.20.12
mgmt_ipv6: 2001:172:20:20::12
vr-n9kv:
kind: vr-n9kv
mgmt_ipv4: 172.20.20.13
mgmt_ipv6: 2001:172:20:20::13
ceos:
kind: ceos
mgmt_ipv4: 172.20.20.14
mgmt_ipv6: 2001:172:20:20::14
vr-vqfx:
kind: vr-vqfx
mgmt_ipv4: 172.20.20.15
mgmt_ipv6: 2001:172:20:20::15
links:
# forces "front panel port" for ceos, without this there is no ip routing
- endpoints: ["ceos:eth1", "ceos:eth2"]
38 changes: 9 additions & 29 deletions .github/workflows/commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
os: [ubuntu-latest]
version: ["3.10"]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: set up python ${{ matrix.version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.version }}
- name: setup test env
Expand All @@ -32,9 +32,9 @@ jobs:
os: [ubuntu-latest]
version: ["3.10"]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: set up python ${{ matrix.version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.version }}
- name: setup test env
Expand All @@ -47,19 +47,19 @@ jobs:
TERM: xterm
run: python -m nox -s unit_tests
- name: Upload coverage
uses: codecov/codecov-action@v2.1.0
uses: codecov/codecov-action@v3.1.0

build_posix:
runs-on: ${{ matrix.os }}
strategy:
max-parallel: 8
max-parallel: 10
matrix:
os: [ubuntu-latest, macos-latest]
version: ["3.7", "3.8", "3.9", "3.10"]
version: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: set up python ${{ matrix.version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.version }}
- name: get friendly (for nox) python version
Expand All @@ -83,23 +83,3 @@ jobs:
TERM: xterm
run: python -m nox -p $FRIENDLY_PYTHON_VERSION -k "not darglint"

docs-test:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- run: docker run -v $(pwd):/docs --entrypoint "" squidfunk/mkdocs-material:latest ash -c 'pip install mdx_gh_links && mkdocs build --clean --strict'
- name: Cache htmltest external links
uses: actions/cache@v2
with:
path: tmp/.htmltest
# key will contain hash of all md files to check if files have changed
# when files are changed, a new key name is formed, and thus a new cache will be saved
key: htmltest-${{ hashFiles('docs/**/*.md') }}
# the restore key will fetch any previously saved cache even if there is no match on key
# this allows to use cache from prev runs and update it
restore-keys: |
htmltest-
- name: htmltest
uses: wjdp/[email protected]
with:
config: docs/htmltest.yml
2 changes: 1 addition & 1 deletion .github/workflows/debug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
runs-on: ubuntu-latest
if: github.actor == github.event.repository.owner.login
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup tmate session
uses: mxschmitt/action-tmate@v3
4 changes: 2 additions & 2 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: set up python 3.10
uses: actions/setup-python@v2
with:
Expand All @@ -27,7 +27,7 @@ jobs:
python setup.py sdist bdist_wheel
python -m twine upload dist/*
- name: create release branch
uses: peterjgrainger/action-create-branch@v2.1.0
uses: peterjgrainger/action-create-branch@v2.2.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/weekly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ jobs:
os: [ubuntu-latest]
version: ["3.10"]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: develop
- name: set up python ${{ matrix.version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.version }}
- name: setup test env
Expand All @@ -31,14 +33,16 @@ jobs:
build_posix:
runs-on: ${{ matrix.os }}
strategy:
max-parallel: 8
max-parallel: 10
matrix:
os: [ubuntu-latest, macos-latest]
version: ["3.7", "3.8", "3.9", "3.10"]
version: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: develop
- name: set up python ${{ matrix.version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.version }}
- name: get friendly (for nox) python version
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ venv.bak/
# pycharm
.idea

# vscode
.vscode/

# mypy
.mypy_cache/
.dmypy.json
Expand Down
Loading

0 comments on commit 3ca5894

Please sign in to comment.