Skip to content

Commit 51e157d

Browse files
dbarrosopdbarrosop
authored
Merge pull request #741 from nornir-automation/develop
release version 3.2.0
2 parents 504b6fc + 30671a3 commit 51e157d

25 files changed

+1314
-1007
lines changed

‎.github/workflows/main.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,22 @@ on: [push,pull_request]
55
jobs:
66
linters:
77
name: linters
8-
runs-on: ubuntu-latest
8+
strategy:
9+
matrix:
10+
python-version: [ '3.9' ]
11+
platform: [ubuntu-latest]
12+
runs-on: ${{ matrix.platform }}
913
steps:
1014
- uses: actions/checkout@v2
1115
- name: Setup python
1216
uses: actions/setup-python@v1
17+
with:
18+
python-version: ${{ matrix.python-version }}
19+
architecture: x64
1320

1421
- name: Install Poetry
15-
uses: snok/install-poetry@v1.1.1
22+
uses: snok/install-poetry@v1
1623
with:
17-
version: 1.1.4
1824
virtualenvs-create: true
1925
virtualenvs-in-project: true
2026

@@ -48,7 +54,7 @@ jobs:
4854
strategy:
4955
matrix:
5056
python-version: [ '3.6', '3.7', '3.8', '3.9' ]
51-
platform: [ubuntu-latest, macos-latest, windows-latest]
57+
platform: [ubuntu-latest, macOS-10.15, windows-latest]
5258
runs-on: ${{ matrix.platform }}
5359
steps:
5460
- uses: actions/checkout@v2
@@ -59,9 +65,8 @@ jobs:
5965
architecture: x64
6066

6167
- name: Install Poetry
62-
uses: snok/install-poetry@v1.1.1
68+
uses: snok/install-poetry@v1
6369
with:
64-
version: 1.1.4
6570
virtualenvs-create: true
6671
virtualenvs-in-project: true
6772

@@ -75,6 +80,7 @@ jobs:
7580

7681
- name: Install Dependencies
7782
run: poetry install
83+
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
7884

7985
- name: Run pytest
8086
run: make pytest

‎CHANGELOG.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
Changelog
22
==========
33

4+
3.2.0 - November 16 2021
5+
------------------------
6+
7+
- update gha snok/install-poetry (#736) @dbarrosop
8+
- Update pygments because of vulnerabilities (#732) @ubaumann
9+
- Replace pkg_resources with importlib (#731) @ubaumann
10+
- Fix GitHub actions MacOS arch failure (#729) @ktbyers
11+
- Minor doc error on NORNIR_RUNNER_OPTIONS environment variable (#725) @ktbyers
12+
- Correct configuration order preference error (#728) @ktbyers
13+
- Update task_results.ipynb (#715) @MajesticFalcon
14+
- fixing domain name typo (#704) @marco-minervino
15+
- update ruamel dependency (#694) @itdependsnetworks
16+
- fixed stubs for mypy 0.900 (#696) @dbarrosop
17+
418
3.1.1 - April 26 2021
519
---------------------
620

‎docs/configuration/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Configuration
22
=============
33

4-
The configuration is comprised of a set of sections and parameters for those sections. You can set the configuration programmatically using nornir by passing a dictionary of options for each section, by using a YAML file, by setting the corresponding environment variables or by a combination of the three. The order of preference from less to more preferred is "configuration file" -> "env variable" -> "code".
4+
The configuration is comprised of a set of sections and parameters for those sections. You can set the configuration programmatically using nornir by passing a dictionary of options for each section, by using a YAML file, by setting the corresponding environment variables or by a combination of the three. The order of preference from less preferred to more preferred is "env variable" -> "configuration file" -> "code".
55

66
An example using ``InitNornir`` would be::
77

‎docs/howto/advanced_filtering.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@
352352
"name": "python",
353353
"nbconvert_exporter": "python",
354354
"pygments_lexer": "ipython3",
355-
"version": "3.8.2"
355+
"version": "3.9.7"
356356
}
357357
},
358358
"nbformat": 4,

‎docs/howto/filtering_deep_dive.ipynb

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
{
2626
"cell_type": "code",
27-
"execution_count": 21,
27+
"execution_count": 1,
2828
"id": "checked-standing",
2929
"metadata": {},
3030
"outputs": [],
@@ -47,7 +47,7 @@
4747
},
4848
{
4949
"cell_type": "code",
50-
"execution_count": 22,
50+
"execution_count": 2,
5151
"id": "certified-clothing",
5252
"metadata": {},
5353
"outputs": [
@@ -427,7 +427,7 @@
427427
},
428428
{
429429
"cell_type": "code",
430-
"execution_count": 23,
430+
"execution_count": 3,
431431
"id": "dirty-spain",
432432
"metadata": {},
433433
"outputs": [
@@ -539,7 +539,7 @@
539539
},
540540
{
541541
"cell_type": "code",
542-
"execution_count": 24,
542+
"execution_count": 4,
543543
"id": "varied-guarantee",
544544
"metadata": {},
545545
"outputs": [
@@ -569,7 +569,7 @@
569569
},
570570
{
571571
"cell_type": "code",
572-
"execution_count": 25,
572+
"execution_count": 5,
573573
"id": "fuzzy-conclusion",
574574
"metadata": {},
575575
"outputs": [
@@ -604,7 +604,7 @@
604604
},
605605
{
606606
"cell_type": "code",
607-
"execution_count": 26,
607+
"execution_count": 6,
608608
"id": "affected-principle",
609609
"metadata": {
610610
"scrolled": true
@@ -647,7 +647,7 @@
647647
},
648648
{
649649
"cell_type": "code",
650-
"execution_count": 27,
650+
"execution_count": 7,
651651
"id": "numeric-musician",
652652
"metadata": {},
653653
"outputs": [
@@ -689,7 +689,7 @@
689689
},
690690
{
691691
"cell_type": "code",
692-
"execution_count": 28,
692+
"execution_count": 8,
693693
"id": "spare-sandwich",
694694
"metadata": {},
695695
"outputs": [
@@ -727,7 +727,7 @@
727727
},
728728
{
729729
"cell_type": "code",
730-
"execution_count": 29,
730+
"execution_count": 9,
731731
"id": "informal-greece",
732732
"metadata": {},
733733
"outputs": [
@@ -788,7 +788,7 @@
788788
},
789789
{
790790
"cell_type": "code",
791-
"execution_count": 30,
791+
"execution_count": 10,
792792
"id": "racial-patio",
793793
"metadata": {},
794794
"outputs": [
@@ -828,7 +828,7 @@
828828
},
829829
{
830830
"cell_type": "code",
831-
"execution_count": 31,
831+
"execution_count": 11,
832832
"id": "technical-currency",
833833
"metadata": {},
834834
"outputs": [
@@ -946,7 +946,7 @@
946946
},
947947
{
948948
"cell_type": "code",
949-
"execution_count": 32,
949+
"execution_count": 12,
950950
"id": "surprising-aircraft",
951951
"metadata": {},
952952
"outputs": [
@@ -981,7 +981,7 @@
981981
},
982982
{
983983
"cell_type": "code",
984-
"execution_count": 33,
984+
"execution_count": 13,
985985
"id": "czech-country",
986986
"metadata": {},
987987
"outputs": [
@@ -1026,7 +1026,7 @@
10261026
},
10271027
{
10281028
"cell_type": "code",
1029-
"execution_count": 34,
1029+
"execution_count": 14,
10301030
"id": "pursuant-sculpture",
10311031
"metadata": {},
10321032
"outputs": [
@@ -1148,7 +1148,7 @@
11481148
},
11491149
{
11501150
"cell_type": "code",
1151-
"execution_count": 35,
1151+
"execution_count": 15,
11521152
"id": "confirmed-february",
11531153
"metadata": {},
11541154
"outputs": [
@@ -1275,7 +1275,7 @@
12751275
},
12761276
{
12771277
"cell_type": "code",
1278-
"execution_count": 36,
1278+
"execution_count": 16,
12791279
"id": "compact-intent",
12801280
"metadata": {},
12811281
"outputs": [
@@ -1400,7 +1400,7 @@
14001400
},
14011401
{
14021402
"cell_type": "code",
1403-
"execution_count": 37,
1403+
"execution_count": 17,
14041404
"id": "headed-commission",
14051405
"metadata": {},
14061406
"outputs": [
@@ -1538,7 +1538,7 @@
15381538
},
15391539
{
15401540
"cell_type": "code",
1541-
"execution_count": 38,
1541+
"execution_count": 18,
15421542
"id": "authentic-opposition",
15431543
"metadata": {},
15441544
"outputs": [
@@ -1723,7 +1723,7 @@
17231723
},
17241724
{
17251725
"cell_type": "code",
1726-
"execution_count": 39,
1726+
"execution_count": 19,
17271727
"id": "thrown-greene",
17281728
"metadata": {},
17291729
"outputs": [
@@ -1974,7 +1974,7 @@
19741974
},
19751975
{
19761976
"cell_type": "code",
1977-
"execution_count": 40,
1977+
"execution_count": 20,
19781978
"id": "forward-salon",
19791979
"metadata": {},
19801980
"outputs": [
@@ -2187,7 +2187,7 @@
21872187
"name": "python",
21882188
"nbconvert_exporter": "python",
21892189
"pygments_lexer": "ipython3",
2190-
"version": "3.8.5"
2190+
"version": "3.9.7"
21912191
}
21922192
},
21932193
"nbformat": 4,

‎docs/howto/handling_connections.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
"name": "python",
191191
"nbconvert_exporter": "python",
192192
"pygments_lexer": "ipython3",
193-
"version": "3.8.6"
193+
"version": "3.9.7"
194194
}
195195
},
196196
"nbformat": 4,

‎docs/tutorial/failed_tasks.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
"\u001b[0m\n",
222222
"\u001b[0m\u001b[1m\u001b[31m---- Greeting is the polite thing to do ** changed : False --------------------- ERROR\u001b[0m\n",
223223
"\u001b[0mTraceback (most recent call last):\n",
224-
" File \"/opt/conda/lib/python3.8/site-packages/nornir/core/task.py\", line 99, in start\n",
224+
" File \"/nornir/core/task.py\", line 99, in start\n",
225225
" r = self.task(self, **self.params)\n",
226226
" File \"<ipython-input-1-3ab8433d31a3>\", line 20, in say\n",
227227
" raise Exception(\"I can't say anything right now\")\n",
@@ -495,7 +495,7 @@
495495
"name": "python",
496496
"nbconvert_exporter": "python",
497497
"pygments_lexer": "ipython3",
498-
"version": "3.8.6"
498+
"version": "3.9.7"
499499
}
500500
},
501501
"nbformat": 4,

‎docs/tutorial/initializing_nornir.ipynb

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@
3434
"data": {
3535
"text/html": [
3636
"<style>\n",
37+
"pre { line-height: 125%; }\n",
38+
"td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }\n",
39+
"span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }\n",
40+
"td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }\n",
41+
"span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }\n",
3742
".pygments .hll { background-color: #ffffcc }\n",
38-
".pygments { background: #f8f8f8; }\n",
3943
".pygments .c { color: #408080; font-style: italic } /* Comment */\n",
4044
".pygments .err { border: 1px solid #FF0000 } /* Error */\n",
4145
".pygments .k { color: #008000; font-weight: bold } /* Keyword */\n",
@@ -107,17 +111,17 @@
107111
"}\n",
108112
"\n",
109113
"</style>\n",
110-
"<div class=\"pygments\"><pre><span></span><span class=\"lineno\"> 1 </span><span class=\"nn\">---</span>\n",
111-
"<span class=\"lineno\"> 2 </span><span class=\"nt\">inventory</span><span class=\"p\">:</span>\n",
112-
"<span class=\"lineno\"> 3 </span> <span class=\"nt\">plugin</span><span class=\"p\">:</span> <span class=\"l l-Scalar l-Scalar-Plain\">SimpleInventory</span>\n",
113-
"<span class=\"lineno\"> 4 </span> <span class=\"nt\">options</span><span class=\"p\">:</span>\n",
114-
"<span class=\"lineno\"> 5 </span> <span class=\"nt\">host_file</span><span class=\"p\">:</span> <span class=\"s\">&quot;inventory/hosts.yaml&quot;</span>\n",
115-
"<span class=\"lineno\"> 6 </span> <span class=\"nt\">group_file</span><span class=\"p\">:</span> <span class=\"s\">&quot;inventory/groups.yaml&quot;</span>\n",
116-
"<span class=\"lineno\"> 7 </span> <span class=\"nt\">defaults_file</span><span class=\"p\">:</span> <span class=\"s\">&quot;inventory/defaults.yaml&quot;</span>\n",
117-
"<span class=\"lineno\"> 8 </span><span class=\"nt\">runner</span><span class=\"p\">:</span>\n",
118-
"<span class=\"lineno\"> 9 </span> <span class=\"nt\">plugin</span><span class=\"p\">:</span> <span class=\"l l-Scalar l-Scalar-Plain\">threaded</span>\n",
119-
"<span class=\"lineno\">10 </span> <span class=\"nt\">options</span><span class=\"p\">:</span>\n",
120-
"<span class=\"lineno\">11 </span> <span class=\"nt\">num_workers</span><span class=\"p\">:</span> <span class=\"l l-Scalar l-Scalar-Plain\">100</span>\n",
114+
"<div class=\"pygments\"><pre><span></span><span class=\"linenos\"> 1</span><span class=\"nn\">---</span>\n",
115+
"<span class=\"linenos\"> 2</span><span class=\"nt\">inventory</span><span class=\"p\">:</span>\n",
116+
"<span class=\"linenos\"> 3</span> <span class=\"nt\">plugin</span><span class=\"p\">:</span> <span class=\"l l-Scalar l-Scalar-Plain\">SimpleInventory</span>\n",
117+
"<span class=\"linenos\"> 4</span> <span class=\"nt\">options</span><span class=\"p\">:</span>\n",
118+
"<span class=\"linenos\"> 5</span> <span class=\"nt\">host_file</span><span class=\"p\">:</span> <span class=\"s\">&quot;inventory/hosts.yaml&quot;</span>\n",
119+
"<span class=\"linenos\"> 6</span> <span class=\"nt\">group_file</span><span class=\"p\">:</span> <span class=\"s\">&quot;inventory/groups.yaml&quot;</span>\n",
120+
"<span class=\"linenos\"> 7</span> <span class=\"nt\">defaults_file</span><span class=\"p\">:</span> <span class=\"s\">&quot;inventory/defaults.yaml&quot;</span>\n",
121+
"<span class=\"linenos\"> 8</span><span class=\"nt\">runner</span><span class=\"p\">:</span>\n",
122+
"<span class=\"linenos\"> 9</span> <span class=\"nt\">plugin</span><span class=\"p\">:</span> <span class=\"l l-Scalar l-Scalar-Plain\">threaded</span>\n",
123+
"<span class=\"linenos\">10</span> <span class=\"nt\">options</span><span class=\"p\">:</span>\n",
124+
"<span class=\"linenos\">11</span> <span class=\"nt\">num_workers</span><span class=\"p\">:</span> <span class=\"l l-Scalar l-Scalar-Plain\">100</span>\n",
121125
"</pre></div>\n",
122126
"\n"
123127
],
@@ -244,7 +248,7 @@
244248
"name": "python",
245249
"nbconvert_exporter": "python",
246250
"pygments_lexer": "ipython3",
247-
"version": "3.9.2"
251+
"version": "3.9.7"
248252
}
249253
},
250254
"nbformat": 4,

0 commit comments

Comments
 (0)