Merge pull request #143 from nautobot/1.2-release-prep

docs: Updated changelog
nautobot · May 1, 2024 · b17545d · b17545d
2 parents 0e2ba17 + be60145
commit b17545d
Show file tree

Hide file tree

Showing 50 changed files with 31 additions and 794 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -95,7 +95,7 @@ jobs:
       fail-fast: true
       matrix:
         python-version: ["3.11"]
-        nautobot-version: ["2.1"]
+        nautobot-version: ["1.6"]
     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: ["1.6"]
     env:
       INVOKE_NAUTOBOT_DESIGN_BUILDER_PYTHON_VER: "${{ matrix.python-version }}"
       INVOKE_NAUTOBOT_DESIGN_BUILDER_NAUTOBOT_VER: "${{ matrix.nautobot-version }}"
@@ -177,14 +177,14 @@ jobs:
       matrix:
         python-version: ["3.8", "3.11"]
         db-backend: ["postgresql"]
-        nautobot-version: ["1.6", "stable"]
+        nautobot-version: ["1.6"]
         include:
           - python-version: "3.11"
             db-backend: "postgresql"
             nautobot-version: "1.6.0"
           - python-version: "3.11"
             db-backend: "mysql"
-            nautobot-version: "stable"
+            nautobot-version: "1.6"
     runs-on: "ubuntu-22.04"
     env:
       INVOKE_NAUTOBOT_DESIGN_BUILDER_PYTHON_VER: "${{ matrix.python-version }}"

diff --git a/development/docker-compose.base.yml b/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:

diff --git a/development/docker-compose.dev.yml b/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"

diff --git a/development/docker-compose.mysql.yml b/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"

diff --git a/development/docker-compose.postgres.yml b/development/docker-compose.postgres.yml
@@ -1,6 +1,4 @@
 ---
-version: "3.8"
-
 services:
   nautobot:
     environment:

diff --git a/development/docker-compose.redis.yml b/development/docker-compose.redis.yml
@@ -1,5 +1,4 @@
 ---
-version: "3.8"
 services:
   redis:
     image: "redis:6-alpine"

diff --git a/development/docker-compose.test-designs.yml b/development/docker-compose.test-designs.yml
@@ -1,5 +1,4 @@
 ---
-version: "3.8"
 services:
   nautobot:
     volumes:

diff --git a/docs/admin/release_notes/version_1.2.md b/docs/admin/release_notes/version_1.2.md
@@ -4,7 +4,7 @@
 
 The 1.2 release of Design Builder removes support for Nautobot 2.x from the long term support branch. Support for Nautobot 1.x will continue in the ltm-1.6 branch while Nautobot 2.0 support will remain in the develop branch.
 
-## [v1.1.0] - 2024-05
+## [v1.2.0] - 2024-05
 
 ### Removed
 

diff --git a/nautobot_design_builder/contrib/tests/test_ext.py b/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()
+    """Test contrib extensions."""
diff --git a/...s/testdata/nautobot_v1/bgp_extension.yaml → ...contrib/tests/testdata/bgp_extension.yaml b/...s/testdata/nautobot_v1/bgp_extension.yaml → ...contrib/tests/testdata/bgp_extension.yaml
diff --git a/...stdata/nautobot_v1/cable_connections.yaml → ...rib/tests/testdata/cable_connections.yaml b/...stdata/nautobot_v1/cable_connections.yaml → ...rib/tests/testdata/cable_connections.yaml
diff --git a/...ts/testdata/nautobot_v1/child_prefix.yaml → .../contrib/tests/testdata/child_prefix.yaml b/...ts/testdata/nautobot_v1/child_prefix.yaml → .../contrib/tests/testdata/child_prefix.yaml
diff --git a/nautobot_design_builder/contrib/tests/testdata/nautobot_v2/bgp_extension.yaml b/nautobot_design_builder/contrib/tests/testdata/nautobot_v2/bgp_extension.yaml
diff --git a/nautobot_design_builder/contrib/tests/testdata/nautobot_v2/cable_connections.yaml b/nautobot_design_builder/contrib/tests/testdata/nautobot_v2/cable_connections.yaml
diff --git a/nautobot_design_builder/contrib/tests/testdata/nautobot_v2/child_prefix.yaml b/nautobot_design_builder/contrib/tests/testdata/nautobot_v2/child_prefix.yaml
diff --git a/nautobot_design_builder/contrib/tests/testdata/nautobot_v2/next_prefix.yaml b/nautobot_design_builder/contrib/tests/testdata/nautobot_v2/next_prefix.yaml