Merge branch 'main' into ogenstad/simplify-filter

.github/workflows/main.yaml

@@ -52,7 +52,7 @@ jobs:
         shell: bash
     strategy:
       matrix:
-        python-version: [ '3.8', '3.9', '3.10', '3.11'  ]
+        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
         platform: [ubuntu-latest, macos-13, windows-2019]
     runs-on: ${{ matrix.platform }}
     steps:
@@ -93,6 +93,10 @@ jobs:
         run: make nbval
         if: ${{ matrix.platform != 'windows-2019' }}
 
+      - name: Report coverage
+        uses: coverallsapp/github-action@v2
+        if: ${{ matrix.platform == 'ubuntu-latest' && matrix.python-version == '3.11' }}
+
 #  release:
 #    name: Releasing to pypi
 #    runs-on: ubuntu-latest

Makefile

@@ -12,7 +12,7 @@ docker:
 
 .PHONY: pytest
 pytest:
-	poetry run pytest --cov=nornir --cov-report=term-missing -vs ${ARGS}
+	poetry run pytest --cov=nornir --cov-report=term-missing --cov-report xml -vs ${ARGS}
 
 .PHONY: mypy
 mypy:

README.md

@@ -1,4 +1,4 @@
-![Build Status](https://github.com/nornir-automation/nornir/workflows/test%20nornir/badge.svg) [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff) [![Coverage Status](https://coveralls.io/repos/github/nornir-automation/nornir/badge.svg?branch=develop)](https://coveralls.io/github/nornir-automation/nornir?branch=develop)
+![Build Status](https://github.com/nornir-automation/nornir/workflows/test%20nornir/badge.svg) [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff) [![Coverage Status](https://coveralls.io/repos/github/nornir-automation/nornir/badge.svg?branch=main)](https://coveralls.io/github/nornir-automation/nornir?branch=main)
 
 
 Nornir

docs/howto/filtering_deep_dive.ipynb

@@ -2056,7 +2056,7 @@
     "    :return bool: True if it matches, False if it doesn't match\n",
     "    \"\"\"\n",
     "    # Perform regex match on host name and return boolean\n",
-    "    if re.match(\".+\\-[0-9][2,4,6,8,0].+\", host.name):\n",
+    "    if re.match(r\".*-\\d[24680].*\", host.name):\n",
     "        return True\n",
     "    else:\n",
     "        return False\n",
@@ -2074,7 +2074,7 @@
     "    :return bool: True if it matches, False if it doesn't match\n",
     "    \"\"\"\n",
     "    # Perform regex match on host name and return boolean\n",
-    "    if re.match(\"\\w{3}\\-\\w+\\-\\d{2}.\\w{3}.norn.local\", host.name):\n",
+    "    if re.match(r\"\\w{3}-\\w+-\\d{2}\\.\\w{3}\\.norn\\.local\", host.name):\n",
     "        return True\n",
     "    else:\n",
     "        return False\n",
@@ -2092,7 +2092,7 @@
     "    :return bool: True if does not match, False if it matches the convention\n",
     "    \"\"\"\n",
     "    # Perform regex match on host name and return boolean\n",
-    "    if re.match(\"\\w{3}\\-\\w+\\-\\d{2}.\\w{3}.norn.local\", host.name):\n",
+    "    if re.match(r\"\\w{3}-\\w+-\\d{2}\\.\\w{3}\\.norn\\.local\", host.name):\n",
     "        return False\n",
     "    else:\n",
     "        return True\n",

pyproject.toml

@@ -23,6 +23,7 @@ classifiers = [
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
 ]
 
 [tool.poetry.dependencies]
@@ -43,7 +44,7 @@ types-Jinja2 = "^2.11.9"
 types-pkg-resources = "^0.1.3"
 nornir-jinja2 = "0.2.0"
 nornir-utils = "0.2.0"
-nornir-napalm = "0.4.0"
+nornir-napalm = "0.5.0"
 ruff = "^0.4.9"
 
 [tool.poetry.group.docs.dependencies]