Merge pull request #647 from nautobot/main

Main
nautobot · Oct 4, 2023 · 6f6d189 · 6f6d189
2 parents d9a56d4 + 7392942
commit 6f6d189
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -121,7 +121,7 @@ jobs:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11"]
         db-backend: ["postgresql"]
-        nautobot-version: ["latest"]
+        nautobot-version: ["stable"]
         # The include is a method to limit the amount of jobs ran. This essentially
         # means that in addition to standard postgres and stable, also the lowest
         # supported version and with mysql
@@ -134,7 +134,7 @@ jobs:
             nautobot-version: "2.0.0"
           - python-version: "3.8"
             db-backend: "mysql"
-            nautobot-version: "latest"
+            nautobot-version: "stable"
     runs-on: "ubuntu-20.04"
     env:
       INVOKE_NAUTOBOT_GOLDEN_CONFIG_PYTHON_VER: "${{ matrix.python-version }}"

diff --git a/invoke.example.yml b/invoke.example.yml
@@ -1,9 +1,9 @@
 ---
 nautobot_golden_config:
   project_name: "nautobot-golden-config"
-  nautobot_ver: "latest"
+  nautobot_ver: "2.0.0"
   local: false
-  python_ver: "3.8"
+  python_ver: "3.11"
   compose_dir: "development"
   compose_files:
     - "docker-compose.base.yml"

diff --git a/invoke.mysql.yml b/invoke.mysql.yml
@@ -1,9 +1,9 @@
 ---
 nautobot_golden_config:
   project_name: "nautobot-golden-config"
-  nautobot_ver: "latest"
+  nautobot_ver: "2.0.0"
   local: false
-  python_ver: "3.8"
+  python_ver: "3.11"
   compose_dir: "development"
   compose_files:
     - "docker-compose.base.yml"

diff --git a/nautobot_golden_config/utilities/logger.py b/nautobot_golden_config/utilities/logger.py
@@ -8,7 +8,7 @@
 handler = logging.StreamHandler()
 handler.setLevel(logging.NOTSET)
 LOGGER.addHandler(handler)
-LOGGER_ADAPTER = logging.LoggerAdapter(LOGGER)
+LOGGER_ADAPTER = logging.LoggerAdapter(LOGGER, extra={})
 
 
 class NornirLogger:

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -35,13 +35,12 @@ python = ">=3.8,<3.12"
 deepdiff = ">=5.5.0,!=6.0,!=6.1,<7"
 django-pivot = "1.8.1" # The signature changed to return a non-queryset, do not upgrade without ensuring it returns a queryset
 matplotlib = "^3.3.2"
-nautobot = "^2.0.0"
 nautobot-plugin-nornir = "^2.0.0"
 
 toml = "^0.10.2"
 netutils = "^1.5.0"
 hier-config = "^2.2.2"
-nautobot-capacity-metrics = "^3.0.0"
+nautobot-capacity-metrics = "^3.0.1"
 
 [tool.poetry.group.dev.dependencies]
 bandit = "*"