Merge pull request #855 from ubaumann/update_dependencies

Update dependencies
nornir-automation · Aug 21, 2023 · 107d6dd · 107d6dd
2 parents 1526240 + 9a9d061
commit 107d6dd
Show file tree

Hide file tree

Showing 15 changed files with 1,676 additions and 1,254 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -54,8 +54,8 @@ jobs:
         shell: bash
     strategy:
       matrix:
-        python-version: [ '3.7', '3.8', '3.9', '3.10' ]
-        platform: [ubuntu-latest, macOS-10.15, windows-latest]
+        python-version: [ '3.8', '3.9', '3.10', '3.11'  ]
+        platform: [ubuntu-latest, macOS-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v2

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 ARG PYTHON
-FROM python:${PYTHON}-slim-stretch
+FROM python:${PYTHON}-slim-bookworm
 
 ENV PATH="/root/.local/bin:$PATH" \
     PYTHONDONTWRITEBYTECODE=1 \
@@ -17,7 +17,7 @@ COPY poetry.lock .
 # Dependencies change more often, so we break RUN to cache the previous layer
 RUN poetry install --no-interaction
 
-ARG NAME
+ARG NAME=nornir
 WORKDIR /${NAME}
 
 COPY . .

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ DOCKER_COMPOSE_FILE=docker-compose.yaml
 DOCKER_COMPOSE=PYTHON=${PYTHON} docker-compose -f ${DOCKER_COMPOSE_FILE}
 NORNIR_DIRS=nornir tests docs
 
-PYTHON:=3.7
+PYTHON:=3.10
 
 .PHONY: docker
 docker:

diff --git a/docs/nbval_sanitize.cfg b/docs/nbval_sanitize.cfg
@@ -9,3 +9,8 @@ replace: File "nornir/nornir/core/task.py"
 [regex3]
 regex: File "[\w\d/]*.py", line
 replace: File "/tmp/ipykernel_random.py", line
+
+# Py3.11 adds "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" to the traceback output
+[regex4]
+regex: \n\s*\^*\n
+replace: \n
diff --git a/docs/tutorial/initializing_nornir.ipynb b/docs/tutorial/initializing_nornir.ipynb
@@ -52,6 +52,7 @@
        ".pygments .cs { color: #3D7B7B; font-style: italic } /* Comment.Special */\n",
        ".pygments .gd { color: #A00000 } /* Generic.Deleted */\n",
        ".pygments .ge { font-style: italic } /* Generic.Emph */\n",
+       ".pygments .ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */\n",
        ".pygments .gr { color: #E40000 } /* Generic.Error */\n",
        ".pygments .gh { color: #000080; font-weight: bold } /* Generic.Heading */\n",
        ".pygments .gi { color: #008400 } /* Generic.Inserted */\n",
@@ -111,17 +112,17 @@
        "}\n",
        "\n",
        "</style>\n",
-       "<div class=\"pygments\"><pre><span></span><span class=\"linenos\"> 1</span><span class=\"nn\">---</span><span class=\"w\"></span>\n",
-       "<span class=\"linenos\"> 2</span><span class=\"nt\">inventory</span><span class=\"p\">:</span><span class=\"w\"></span>\n",
-       "<span class=\"linenos\"> 3</span><span class=\"w\">    </span><span class=\"nt\">plugin</span><span class=\"p\">:</span><span class=\"w\"> </span><span class=\"l l-Scalar l-Scalar-Plain\">SimpleInventory</span><span class=\"w\"></span>\n",
-       "<span class=\"linenos\"> 4</span><span class=\"w\">    </span><span class=\"nt\">options</span><span class=\"p\">:</span><span class=\"w\"></span>\n",
-       "<span class=\"linenos\"> 5</span><span class=\"w\">        </span><span class=\"nt\">host_file</span><span class=\"p\">:</span><span class=\"w\"> </span><span class=\"s\">&quot;inventory/hosts.yaml&quot;</span><span class=\"w\"></span>\n",
-       "<span class=\"linenos\"> 6</span><span class=\"w\">        </span><span class=\"nt\">group_file</span><span class=\"p\">:</span><span class=\"w\"> </span><span class=\"s\">&quot;inventory/groups.yaml&quot;</span><span class=\"w\"></span>\n",
-       "<span class=\"linenos\"> 7</span><span class=\"w\">        </span><span class=\"nt\">defaults_file</span><span class=\"p\">:</span><span class=\"w\"> </span><span class=\"s\">&quot;inventory/defaults.yaml&quot;</span><span class=\"w\"></span>\n",
-       "<span class=\"linenos\"> 8</span><span class=\"nt\">runner</span><span class=\"p\">:</span><span class=\"w\"></span>\n",
-       "<span class=\"linenos\"> 9</span><span class=\"w\">    </span><span class=\"nt\">plugin</span><span class=\"p\">:</span><span class=\"w\"> </span><span class=\"l l-Scalar l-Scalar-Plain\">threaded</span><span class=\"w\"></span>\n",
-       "<span class=\"linenos\">10</span><span class=\"w\">    </span><span class=\"nt\">options</span><span class=\"p\">:</span><span class=\"w\"></span>\n",
-       "<span class=\"linenos\">11</span><span class=\"w\">        </span><span class=\"nt\">num_workers</span><span class=\"p\">:</span><span class=\"w\"> </span><span class=\"l l-Scalar l-Scalar-Plain\">100</span><span class=\"w\"></span>\n",
+       "<div class=\"pygments\"><pre><span></span><span class=\"linenos\"> 1</span><span class=\"nn\">---</span>\n",
+       "<span class=\"linenos\"> 2</span><span class=\"nt\">inventory</span><span class=\"p\">:</span>\n",
+       "<span class=\"linenos\"> 3</span><span class=\"w\">    </span><span class=\"nt\">plugin</span><span class=\"p\">:</span><span class=\"w\"> </span><span class=\"l l-Scalar l-Scalar-Plain\">SimpleInventory</span>\n",
+       "<span class=\"linenos\"> 4</span><span class=\"w\">    </span><span class=\"nt\">options</span><span class=\"p\">:</span>\n",
+       "<span class=\"linenos\"> 5</span><span class=\"w\">        </span><span class=\"nt\">host_file</span><span class=\"p\">:</span><span class=\"w\"> </span><span class=\"s\">&quot;inventory/hosts.yaml&quot;</span>\n",
+       "<span class=\"linenos\"> 6</span><span class=\"w\">        </span><span class=\"nt\">group_file</span><span class=\"p\">:</span><span class=\"w\"> </span><span class=\"s\">&quot;inventory/groups.yaml&quot;</span>\n",
+       "<span class=\"linenos\"> 7</span><span class=\"w\">        </span><span class=\"nt\">defaults_file</span><span class=\"p\">:</span><span class=\"w\"> </span><span class=\"s\">&quot;inventory/defaults.yaml&quot;</span>\n",
+       "<span class=\"linenos\"> 8</span><span class=\"nt\">runner</span><span class=\"p\">:</span>\n",
+       "<span class=\"linenos\"> 9</span><span class=\"w\">    </span><span class=\"nt\">plugin</span><span class=\"p\">:</span><span class=\"w\"> </span><span class=\"l l-Scalar l-Scalar-Plain\">threaded</span>\n",
+       "<span class=\"linenos\">10</span><span class=\"w\">    </span><span class=\"nt\">options</span><span class=\"p\">:</span>\n",
+       "<span class=\"linenos\">11</span><span class=\"w\">        </span><span class=\"nt\">num_workers</span><span class=\"p\">:</span><span class=\"w\"> </span><span class=\"l l-Scalar l-Scalar-Plain\">100</span>\n",
        "</pre></div>\n",
        "\n"
       ],