Merge pull request #230 from nautobot/main

Main

.github/workflows/ci.yml

@@ -126,9 +126,6 @@ jobs:
           - python-version: "3.11"
             db-backend: "postgresql"
             nautobot-version: "stable"
-          # - python-version: "3.11"
-          #   db-backend: "mysql"
-          #   nautobot-version: "2.0.0-rc.4"
     runs-on: "ubuntu-20.04"
     env:
       INVOKE_NAUTOBOT_DEVICE_LIFECYCLE_MGMT_PYTHON_VER: "${{ matrix.python-version }}"

docs/requirements.txt

@@ -1,4 +1,4 @@
-mkdocs==1.3.1
+mkdocs==1.4.3
 mkdocs-material==8.4.2
 mkdocstrings==0.19
 mkdocstrings-python==0.7.1

mkdocs.yml

@@ -81,7 +81,7 @@ markdown_extensions:
   - "footnotes"
 plugins:
   - "search"
-  - include-markdown
+  - "include-markdown"
   - "mkdocs-version-annotations"
   - "mkdocstrings":
       default_handler: "python"

nautobot_device_lifecycle_mgmt/tests/test_basic.py

@@ -15,20 +15,3 @@ def test_version(self):
         parent_path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
         poetry_version = toml.load(os.path.join(parent_path, "pyproject.toml"))["tool"]["poetry"]["version"]
         self.assertEqual(project_version, poetry_version)
-
-
-class TestDocsPackaging(unittest.TestCase):
-    """Test Version in doc requirements is the same pyproject."""
-
-    def test_version(self):
-        """Verify that pyproject.toml dev dependecies have the same versions as in the docs requirements.txt."""
-        parent_path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
-        poetry_details = toml.load(os.path.join(parent_path, "pyproject.toml"))["tool"]["poetry"]["dev-dependencies"]
-        with open(f"{parent_path}/docs/requirements.txt", "r", encoding="utf-8") as file:
-            requirements = [line for line in file.read().splitlines() if (len(line) > 0 and not line.startswith("#"))]
-        for pkg in requirements:
-            if len(pkg.split("==")) == 2:
-                pkg, version = pkg.split("==")
-            else:
-                version = "*"
-            self.assertEqual(poetry_details[pkg], version)

pyproject.toml

@@ -35,7 +35,7 @@ yamllint = "*"
 mysqlclient = "*"
 python-dotenv = "*"
 Markdown = "*"
-mkdocs = "~1.4.3"
+mkdocs = "1.4.3"
 # Material for mkdocs theme
 mkdocs-material = "~9.1.18"
 # Render custom markdown for version added/changed/remove notes
@@ -44,6 +44,7 @@ mkdocs-version-annotations = "1.0.0"
 mkdocstrings = "~0.22.0"
 # Python-specific extension to mkdocstrings
 mkdocstrings-python = "~1.3.0"
+mkdocs-include-markdown-plugin = "3.9.1"
 pylint-nautobot = "*"
 
 [tool.poetry.group.dev.dependencies]