From 828e276b6c14f80703f2d6680bb3d9798731645a Mon Sep 17 00:00:00 2001
From: Alexander Xydes <alexander.xydes@navy.mil>
Date: Tue, 21 Dec 2021 13:16:16 -0800
Subject: [PATCH] Quoting version numbers in yaml. Switching to official python
 3.10 (#42)

* Adding new package (and config option specifying it) needed for stylelint to process html.
* Updating stylelint configuration for unit tests to parse both html and css.

Signed-off-by: Alexander Xydes <alexander.xydes@navy.mil>
---
 .github/workflows/publish.yaml                |  6 ++---
 .github/workflows/tests.yaml                  |  3 ++-
 rsc/.stylelintrc                              | 18 ++++++++------
 .../valid_package/rsc/.stylelintrc            | 24 +++++++++++++------
 4 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 1a846ee..b7fc423 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -4,7 +4,7 @@ name: Publish Python 🐍 distributions 📦 to PyPI and TestPyPI
 on: # NOLINT
   push:
     tags:
-      - "*"
+      - '*'
 
 jobs:
   build-n-publish:
@@ -15,9 +15,9 @@ jobs:
       - uses: actions/checkout@master
 
       - name: Set up Python 3.8
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: '3.8'
 
       - uses: actions/cache@v1
         if: startsWith(runner.os, 'Linux')
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 699f0c9..e92143c 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-10.15, ubuntu-18.04, ubuntu-20.04, windows-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9, 3.10.0-rc.2]
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 
     steps:
       - uses: actions/checkout@v2
@@ -84,6 +84,7 @@ jobs:
           sudo npm install -g jshint
           sudo npm install -g markdownlint-cli
           sudo npm install -g prettier
+          sudo npm install -g postcss-html # needed for stylelint to process html
           sudo npm install -g stylelint
           sudo npm install -g stylelint-config-standard
           rm nodesource_setup.sh
diff --git a/rsc/.stylelintrc b/rsc/.stylelintrc
index 050c4d8..3b6d477 100644
--- a/rsc/.stylelintrc
+++ b/rsc/.stylelintrc
@@ -1,7 +1,11 @@
-extends:
-  - /usr/local/lib/node_modules/stylelint-config-standard
-
-rules:
-  declaration-colon-space-after:
-    - always
-    - severity: warning
+{
+  "extends": ["stylelint-config-standard"],
+  "rules": {
+    "declaration-colon-space-after": [
+      "always",
+      {
+        "severity": "warning"
+      }
+    ],
+  },
+}
diff --git a/tests/tool/stylelint_tool_plugin/valid_package/rsc/.stylelintrc b/tests/tool/stylelint_tool_plugin/valid_package/rsc/.stylelintrc
index 050c4d8..1823153 100644
--- a/tests/tool/stylelint_tool_plugin/valid_package/rsc/.stylelintrc
+++ b/tests/tool/stylelint_tool_plugin/valid_package/rsc/.stylelintrc
@@ -1,7 +1,17 @@
-extends:
-  - /usr/local/lib/node_modules/stylelint-config-standard
-
-rules:
-  declaration-colon-space-after:
-    - always
-    - severity: warning
+{
+  "extends": ["stylelint-config-standard"],
+  "rules": {
+    "declaration-colon-space-after": [
+      "always",
+      {
+        "severity": "warning"
+      }
+    ],
+  },
+  "overrides": [
+    {
+      "files": ["../*.html"],
+      "customSyntax": "postcss-html",
+    }
+  ],
+}