Fix: exclude matrix combination of python3.10 and devel (#156)

yurnov · web-flow · commit c2e1baca9424 · 2024-06-17T14:09:49.000-04:00
* Fix: exclude matrix combination of python3.10 and devel version of ansible Rationale: support of Python3.10 was removed ansible/ansible#83221 * add combination of py3.10+milestone to exclude list remove some obsolete combination that don't look valid anymore * revert .vscode/settings.json to remove change from PR * reverted back python3.12 for ansible 2.15 * fix issue ralated to copy/paste
diff --git a/.github/workflows/integration_simple.yml b/.github/workflows/integration_simple.yml
@@ -16,10 +16,6 @@ on:
         # devel is 2.16 until 2023-09-18
         default: >-
           [
-            {
-              "ansible-version": "stable-2.13",
-              "python-version": "3.11"
-            },
             {
               "ansible-version": "stable-2.16",
               "python-version": "3.9"
@@ -31,7 +27,19 @@ on:
             {
               "ansible-version": "devel",
               "python-version": "3.9"
-            }
+            },
+            {
+              "ansible-version": "devel",
+              "python-version": "3.10"
+            },
+            {
+              "ansible-version": "milestone",
+              "python-version": "3.10"
+            },
+            {
+              "ansible-version": "stable-2.15",
+              "python-version": "3.12"
+             }
           ]
         required: false
         type: string
diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
@@ -17,10 +17,6 @@ on:
         # remove 3.12/milestone from matrix_exclude when milestone is next forwarded
         default: >-
           [
-            {
-              "ansible-version": "stable-2.15",
-              "python-version": "3.12"
-            },
             {
               "ansible-version": "stable-2.16",
               "python-version": "3.9"
@@ -34,12 +30,20 @@ on:
               "python-version": "3.9"
             },
             {
-              "ansible-version": "milestone",
-              "python-version": "3.12"
+              "ansible-version": "devel",
+              "python-version": "3.9"
             },
             {
               "ansible-version": "devel",
-              "python-version": "3.9"
+              "python-version": "3.10"
+            },
+            {
+              "ansible-version": "milestone",
+              "python-version": "3.10"
+            },
+            {
+              "ansible-version": "stable-2.15",
+              "python-version": "3.12"
             }
           ]
         required: false
diff --git a/.github/workflows/unit_galaxy.yml b/.github/workflows/unit_galaxy.yml
@@ -15,10 +15,6 @@ on:
         # devel is 2.16 until 2023-09-18
         default: >-
           [
-            {
-              "ansible-version": "stable-2.15",
-              "python-version": "3.12"
-            },
             {
               "ansible-version": "stable-2.16",
               "python-version": "3.9"
@@ -32,13 +28,21 @@ on:
               "python-version": "3.9"
             },
             {
-              "ansible-version": "milestone",
-              "python-version": "3.12"
+              "ansible-version": "devel",
+              "python-version": "3.9"
             },
             {
               "ansible-version": "devel",
-              "python-version": "3.9"
-            }
+              "python-version": "3.10"
+            },
+            {
+              "ansible-version": "milestone",
+              "python-version": "3.10"
+            },
+            {
+              "ansible-version": "stable-2.15",
+              "python-version": "3.12"
+             }
           ]
         required: false
         type: string
diff --git a/.github/workflows/unit_source.yml b/.github/workflows/unit_source.yml
@@ -15,10 +15,6 @@ on:
         # devel is 2.18 until xxxx-xx-xx
         default: >-
           [
-            {
-              "ansible-version": "stable-2.15",
-              "python-version": "3.12"
-            },
             {
               "ansible-version": "stable-2.16",
               "python-version": "3.9"
@@ -34,6 +30,18 @@ on:
             {
               "ansible-version": "devel",
               "python-version": "3.9"
+            },
+            {
+              "ansible-version": "devel",
+              "python-version": "3.10"
+            },
+            {
+              "ansible-version": "milestone",
+              "python-version": "3.10"
+            },
+            {
+              "ansible-version": "stable-2.15",
+              "python-version": "3.12"
             }
           ]
         required: false
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,7 +7,7 @@
   "isort.check": true,
   "[python]": {
     "editor.codeActionsOnSave": {
-      "source.organizeImports": true
+      "source.organizeImports": "explicit"
     }
   },
   "prettier.enable": true

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,6 @@ on:`
`17`	`17`	`# remove 3.12/milestone from matrix_exclude when milestone is next forwarded`
`18`	`18`	`default: >-`
`19`	`19`	`[`
`20`		`- {`
`21`		`- "ansible-version": "stable-2.15",`
`22`		`- "python-version": "3.12"`
`23`		`- },`
`24`	`20`	`{`
`25`	`21`	`"ansible-version": "stable-2.16",`
`26`	`22`	`"python-version": "3.9"`
`@@ -34,12 +30,20 @@ on:`
`34`	`30`	`"python-version": "3.9"`
`35`	`31`	`},`
`36`	`32`	`{`
`37`		`- "ansible-version": "milestone",`
`38`		`- "python-version": "3.12"`
	`33`	`+ "ansible-version": "devel",`
	`34`	`+ "python-version": "3.9"`
`39`	`35`	`},`
`40`	`36`	`{`
`41`	`37`	`"ansible-version": "devel",`
`42`		`- "python-version": "3.9"`
	`38`	`+ "python-version": "3.10"`
	`39`	`+ },`
	`40`	`+ {`
	`41`	`+ "ansible-version": "milestone",`
	`42`	`+ "python-version": "3.10"`
	`43`	`+ },`
	`44`	`+ {`
	`45`	`+ "ansible-version": "stable-2.15",`
	`46`	`+ "python-version": "3.12"`
`43`	`47`	`}`
`44`	`48`	`]`
`45`	`49`	`required: false`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,6 @@ on:`
`15`	`15`	`# devel is 2.18 until xxxx-xx-xx`
`16`	`16`	`default: >-`
`17`	`17`	`[`
`18`		`- {`
`19`		`- "ansible-version": "stable-2.15",`
`20`		`- "python-version": "3.12"`
`21`		`- },`
`22`	`18`	`{`
`23`	`19`	`"ansible-version": "stable-2.16",`
`24`	`20`	`"python-version": "3.9"`
`@@ -34,6 +30,18 @@ on:`
`34`	`30`	`{`
`35`	`31`	`"ansible-version": "devel",`
`36`	`32`	`"python-version": "3.9"`
	`33`	`+ },`
	`34`	`+ {`
	`35`	`+ "ansible-version": "devel",`
	`36`	`+ "python-version": "3.10"`
	`37`	`+ },`
	`38`	`+ {`
	`39`	`+ "ansible-version": "milestone",`
	`40`	`+ "python-version": "3.10"`
	`41`	`+ },`
	`42`	`+ {`
	`43`	`+ "ansible-version": "stable-2.15",`
	`44`	`+ "python-version": "3.12"`
`37`	`45`	`}`
`38`	`46`	`]`
`39`	`47`	`required: false`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"isort.check": true,`
`8`	`8`	`"[python]": {`
`9`	`9`	`"editor.codeActionsOnSave": {`
`10`		`- "source.organizeImports": true`
	`10`	`+ "source.organizeImports": "explicit"`
`11`	`11`	`}`
`12`	`12`	`},`
`13`	`13`	`"prettier.enable": true`