From 1dbdbfc431617836487d57f563fccb1d1531b2fa Mon Sep 17 00:00:00 2001
From: Russell Bunch <doomslayer@hpe.com>
Date: Thu, 14 Sep 2023 18:08:57 -0500
Subject: [PATCH 1/2] Fix import errors during doc generation

Fixes import errors during docs generation.

Also ensures tags are pulled for `setuptools_scm` to work properly.

Updates some actions to newer/latest versions.
---
 .github/workflows/docs.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 4f31e96..17b7aed 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -30,19 +30,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-python@v4
       - name: Install dependencies
         run: |
           pip install setuptools_scm[toml]
           pip install .[docs]
+          pip install .
       - name: Sphinx build
         run: |
           make docs
       - name: Setup Pages
         uses: actions/configure-pages@v3
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v2
         with:
           # Upload entire repository
           path: 'docs/_build/'

From 04bb0000c91eff4a13d539e548586222599380dc Mon Sep 17 00:00:00 2001
From: Russell Bunch <doomslayer@hpe.com>
Date: Thu, 14 Sep 2023 18:09:54 -0500
Subject: [PATCH 2/2] Remove some redundancy

---
 noxfile.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index e865ed1..1979ebc 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -73,7 +73,7 @@ def test(session):
     session.run(
         'pytest',
         '--quiet',
-        '--cov=libcsm',
+        f'--cov={locations}',
         '--cov-append',
         '--cov-report=',
         f'--cov-fail-under={COVERAGE_FAIL}',
@@ -88,17 +88,7 @@ def lint(session):
     session.install(".[lint]")
     session.install(".[test]")
     session.install(".")
-    session.run("ruff", "check", "libcsm/")
-
-
-@nox.session(python='3')
-def docs(session):
-    """Run flake8 linter and plugins."""
-    session.install('setuptools_scm[toml]')
-    session.install('.')
-    session.install('.[docs]')
-    session.run('make', 'docs')
-
+    session.run("ruff", "check", f"{locations}/")
 
 @nox.session(python='3')
 def cover(session):