Merge pull request #140 from nautobot/2.x_branch_prep

Version 2.0 prep

.github/workflows/ci.yml

@@ -95,7 +95,7 @@ jobs:
       fail-fast: true
       matrix:
         python-version: ["3.11"]
-        nautobot-version: ["2.1"]
+        nautobot-version: ["2.2"]
     env:
       INVOKE_NAUTOBOT_DESIGN_BUILDER_PYTHON_VER: "${{ matrix.python-version }}"
       INVOKE_NAUTOBOT_DESIGN_BUILDER_NAUTOBOT_VER: "${{ matrix.nautobot-version }}"
@@ -138,7 +138,7 @@ jobs:
       fail-fast: true
       matrix:
         python-version: ["3.11"]
-        nautobot-version: ["2.1"]
+        nautobot-version: ["2.2"]
     env:
       INVOKE_NAUTOBOT_DESIGN_BUILDER_PYTHON_VER: "${{ matrix.python-version }}"
       INVOKE_NAUTOBOT_DESIGN_BUILDER_NAUTOBOT_VER: "${{ matrix.nautobot-version }}"
@@ -177,11 +177,8 @@ jobs:
       matrix:
         python-version: ["3.8", "3.11"]
         db-backend: ["postgresql"]
-        nautobot-version: ["1.6", "stable"]
+        nautobot-version: ["stable"]
         include:
-          - python-version: "3.11"
-            db-backend: "postgresql"
-            nautobot-version: "1.6.0"
           - python-version: "3.11"
             db-backend: "mysql"
             nautobot-version: "stable"

development/Dockerfile

@@ -7,7 +7,7 @@
 # !!! USE CAUTION WHEN MODIFYING LINES BELOW
 
 # Accepts a desired Nautobot version as build argument, default to 1.6.0
-ARG NAUTOBOT_VER="1.6.0"
+ARG NAUTOBOT_VER="2.0.0"
 
 # Accepts a desired Python version as build argument, default to 3.11
 ARG PYTHON_VER="3.11"

development/docker-compose.base.yml

@@ -13,7 +13,6 @@ x-nautobot-base: &nautobot-base
     - "creds.env"
   tty: true
 
-version: "3.8"
 services:
   nautobot:
     depends_on:

development/docker-compose.dev.yml

@@ -3,7 +3,6 @@
 # any override will need to include these volumes to use them.
 # see:  https://github.com/docker/compose/issues/3729
 ---
-version: "3.8"
 services:
   nautobot:
     command: "nautobot-server runserver 0.0.0.0:8080"

development/docker-compose.mysql.yml

@@ -1,6 +1,4 @@
 ---
-version: "3.8"
-
 services:
   nautobot:
     environment:
@@ -25,8 +23,6 @@ services:
       - "development_mysql.env"
   db:
     image: "mysql:8"
-    command:
-      - "--default-authentication-plugin=mysql_native_password"
     env_file:
       - "development.env"
       - "creds.env"

development/docker-compose.postgres.yml

@@ -1,6 +1,4 @@
 ---
-version: "3.8"
-
 services:
   nautobot:
     environment:

development/docker-compose.redis.yml

@@ -1,5 +1,4 @@
 ---
-version: "3.8"
 services:
   redis:
     image: "redis:6-alpine"

development/docker-compose.test-designs.yml

@@ -1,5 +1,4 @@
 ---
-version: "3.8"
 services:
   nautobot:
     volumes:

development/nautobot_config.py

@@ -1,12 +1,8 @@
 """Nautobot development configuration file."""
 
-from importlib import metadata
-from importlib.util import find_spec
 import os
 import sys
 
-from packaging.version import Version
-
 from nautobot.core.settings import *  # noqa: F403  # pylint: disable=wildcard-import,unused-wildcard-import
 from nautobot.core.settings_funcs import is_truthy, parse_redis_connection
 
@@ -140,28 +136,6 @@
 # Each key in the dictionary is the name of an installed App and its value is a dictionary of settings.
 
 if is_truthy(os.getenv("DESIGN_BUILDER_ENABLE_BGP", "False")):
-    if find_spec("nautobot_bgp_models") is None:
-        nautobot_version = Version(Version(metadata.version("nautobot")).base_version)
-        import subprocess  # nosec
-
-        package = "nautobot-bgp-models"
-        if nautobot_version < Version("2.0"):
-            # pip doesn't have the capability to automatically pick
-            # a version compatible with the current Nautobot, so we
-            # do that manually. This is only for development environments
-            # so that we can run unit tests on Nautobot 1.6 and 2.x
-            package = "nautobot-bgp-models==0.9.1"
-        command = [
-            sys.executable,
-            "-m",
-            "pip",
-            "install",
-            package,
-        ]
-        # Since we aren't evaluating any input variables, *and* we
-        # are not using a shell, this command should be considered
-        # save, therefore the `nosec` annotation.
-        subprocess.check_call(command, shell=False)  # nosec
     PLUGINS.append("nautobot_bgp_models")
 
 PLUGINS_CONFIG = {"design_builder": {"context_repository": os.getenv("DESIGN_BUILDER_CONTEXT_REPO_SLUG", None)}}

invoke.example.yml

@@ -1,9 +1,9 @@
 ---
 nautobot_design_builder:
   project_name: "nautobot-design-builder"
-  nautobot_ver: "1.6.0"
-  local: false
   python_ver: "3.11"
+  nautobot_ver: "2.2"
+  local: false
   compose_dir: "development"
   compose_files:
     - "docker-compose.base.yml"

invoke.mysql.yml

@@ -1,9 +1,9 @@
 ---
 nautobot_design_builder:
   project_name: "nautobot-design-builder"
-  nautobot_ver: "1.6.0"
-  local: false
   python_ver: "3.11"
+  nautobot_ver: "2.2"
+  local: false
   compose_dir: "development"
   compose_files:
     - "docker-compose.base.yml"

nautobot_design_builder/contrib/tests/test_ext.py

@@ -5,29 +5,8 @@
 from django.test import TestCase
 
 from nautobot_design_builder.tests.test_builder import builder_test_case
-from nautobot_design_builder.util import nautobot_version
 
 
 @builder_test_case(os.path.join(os.path.dirname(__file__), "testdata"))
 class TestAgnosticExtensions(TestCase):
     """Test contrib extensions against any version of Nautobot."""
-
-
-@builder_test_case(os.path.join(os.path.dirname(__file__), "testdata", "nautobot_v1"))
-class TestV1Extensions(TestCase):
-    """Test contrib extensions against Nautobot V1."""
-
-    def setUp(self):
-        if nautobot_version >= "2.0.0":
-            self.skipTest("These tests are only supported in Nautobot 1.x")
-        super().setUp()
-
-
-@builder_test_case(os.path.join(os.path.dirname(__file__), "testdata", "nautobot_v2"))
-class TestV2Extensions(TestCase):
-    """Test contrib extensions against Nautobot V2."""
-
-    def setUp(self):
-        if nautobot_version < "2.0.0":
-            self.skipTest("These tests are only supported in Nautobot 2.x")
-        super().setUp()