initial pass, 33 failing tests remaining

nautobot · Sep 5, 2023 · 07cd0dd · 07cd0dd
1 parent 58d367c
commit 07cd0dd
Show file tree

Hide file tree

Showing 44 changed files with 2,796 additions and 1,808 deletions.
diff --git a/development/Dockerfile b/development/Dockerfile
@@ -7,13 +7,13 @@
 # !!! USE CAUTION WHEN MODIFYING LINES BELOW
 
 # Accepts a desired Nautobot version as build argument, default to 1.4.1
-ARG NAUTOBOT_VER="1.4.1"
+ARG NAUTOBOT_VER="2.0.0rc2"
 
 # Accepts a desired Python version as build argument, default to 3.8
-ARG PYTHON_VER="3.8"
+ARG PYTHON_VER="3.11"
 
 # Retrieve published development image of Nautobot base which should include most CI dependencies
-FROM ghcr.io/nautobot/nautobot-dev:1.5.10-py${PYTHON_VER}
+FROM ghcr.io/nautobot/nautobot-dev:2.0.0-rc.2-py3.11
 
 # Runtime argument and environment setup
 ARG NAUTOBOT_ROOT=/opt/nautobot
@@ -69,7 +69,7 @@ RUN pip install -c constraints.txt -e .
 # Can be improved in Poetry 1.2 which allows `poetry install --only dev`
 RUN pip install -c constraints.txt -r poetry_freeze_dev.txt
 
-RUN pip install nautobot==2.0.0a1
+RUN pip install nautobot==2.0.0rc2
 
 COPY development/nautobot_config.py ${NAUTOBOT_ROOT}/nautobot_config.py
 # !!! USE CAUTION WHEN MODIFYING LINES ABOVE

diff --git a/development/nautobot_config.py b/development/nautobot_config.py
@@ -80,12 +80,12 @@
         "handlers": {
             "normal_console": {
                 "level": "INFO",
-                "class": "rq.utils.ColorizingStreamHandler",
+                "class": "logging.StreamHandler",
                 "formatter": "normal",
             },
             "verbose_console": {
                 "level": "DEBUG",
-                "class": "rq.utils.ColorizingStreamHandler",
+                "class": "logging.StreamHandler",
                 "formatter": "verbose",
             },
         },
@@ -95,10 +95,6 @@
                 "handlers": ["verbose_console" if DEBUG else "normal_console"],
                 "level": LOG_LEVEL,
             },
-            "rq.worker": {
-                "handlers": ["verbose_console" if DEBUG else "normal_console"],
-                "level": LOG_LEVEL,
-            },
         },
     }
 

diff --git a/nautobot_firewall_models/__init__.py b/nautobot_firewall_models/__init__.py
@@ -1,10 +1,7 @@
 """Plugin declaration for nautobot_firewall_models."""
 # Metadata is inherited from Nautobot. If not including Nautobot in the environment, this should be added
-try:
-    from importlib import metadata
-except ImportError:
-    # Python version < 3.8
-    import importlib_metadata as metadata
+from importlib import metadata
+
 
 __version__ = metadata.version(__name__)
 

diff --git a/nautobot_firewall_models/api/nested_serializers.py b/nautobot_firewall_models/api/nested_serializers.py