From ec9a3e80daa5efd2643c8e5127b04eea92383da5 Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Sat, 12 Apr 2025 10:26:09 +0200
Subject: [PATCH 1/3] Prepare for NetBox 4.3

---
 .editorconfig              | 3 +++
 Dockerfile                 | 2 ++
 VERSION                    | 2 +-
 docker-compose.yml         | 2 +-
 requirements-container.txt | 1 -
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 7f9f55d..4f5c931 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,3 +9,6 @@ indent_size = 2
 
 [*.py]
 indent_size = 4
+
+[VERSION]
+insert_final_newline = false
diff --git a/Dockerfile b/Dockerfile
index 012b7f9..fb5e894 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,6 +33,8 @@ RUN \
     # we have potential version conflicts and the build will fail.
     # That's why we just replace it in the original requirements.txt.
     sed -i -e 's/social-auth-core/social-auth-core\[all\]/g' /requirements.txt && \
+    # The same is true for 'django-storages'
+    sed -i -e 's/django-storages/django-storages\[azure,boto3,dropbox,google,libcloud,sftp\]/g' /requirements.txt && \
     /usr/local/bin/uv pip install \
       -r /requirements.txt \
       -r /requirements-container.txt
diff --git a/VERSION b/VERSION
index 944880f..0fa4ae4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.2.0
+3.3.0
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 65176c5..dec846b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   netbox: &netbox
-    image: docker.io/netboxcommunity/netbox:${VERSION-v4.2-3.2.0}
+    image: docker.io/netboxcommunity/netbox:${VERSION-v4.3-3.3.0}
     depends_on:
       - postgres
       - redis
diff --git a/requirements-container.txt b/requirements-container.txt
index 4011fd7..6b79c47 100644
--- a/requirements-container.txt
+++ b/requirements-container.txt
@@ -1,5 +1,4 @@
 django-auth-ldap==5.1.0
-django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.6
 dulwich==0.22.8
 python3-saml==1.16.0
 --no-binary lxml

From 8f7c21749e3caa4c18506c46cd0352526ac2e00f Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Sat, 12 Apr 2025 11:10:33 +0200
Subject: [PATCH 2/3] Match upstream testing configuration

---
 test-configuration/test_config.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test-configuration/test_config.py b/test-configuration/test_config.py
index 76ec6a0..308d437 100644
--- a/test-configuration/test_config.py
+++ b/test-configuration/test_config.py
@@ -7,5 +7,6 @@ PLUGINS = [
     'netbox.tests.dummy_plugin',
 ]
 
+ALLOW_TOKEN_RETRIEVAL = True
 
 DEFAULT_PERMISSIONS = {}

From 8431b77422a7b49316d4b219436281215770ba4d Mon Sep 17 00:00:00 2001
From: Tobias Genannt <tobias.genannt@gmail.com>
Date: Sat, 19 Apr 2025 17:36:09 +0200
Subject: [PATCH 3/3] Use develop branch for pre-releases

---
 .github/workflows/release.yml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 347874e..71b718c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,11 +13,13 @@ jobs:
   build:
     strategy:
       matrix:
-        build_cmd:
-          - ./build-latest.sh
-          - PRERELEASE=true ./build-latest.sh
-          - ./build.sh feature
-          - ./build.sh main
+        build:
+          - { "cmd": "./build-latest.sh", "branch": "release" }
+          - { "cmd": "./build.sh main", "branch": "release" }
+          # Build pre release images from our develop branch
+          # This is used to test the latest changes before they are merged into the main branch
+          - { "cmd": "PRERELEASE=true ./build-latest.sh", "branch": "develop" }
+          - { "cmd": "./build.sh feature", "branch": "develop" }
         platform:
           - linux/amd64,linux/arm64
       fail-fast: false
@@ -31,15 +33,17 @@ jobs:
       - id: source-checkout
         name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ matrix.build.branch }}
       - id: set-netbox-docker-version
         name: Get Version of NetBox Docker
         run: echo "version=$(cat VERSION)" >>"$GITHUB_OUTPUT"
         shell: bash
       - id: check-build-needed
-        name: Check if the build is needed for '${{ matrix.build_cmd }}'
+        name: Check if the build is needed for '${{ matrix.build.cmd }}'
         env:
           CHECK_ONLY: "true"
-        run: ${{ matrix.build_cmd }}
+        run: ${{ matrix.build.cmd }}
       # docker.io
       - id: docker-io-login
         name: Login to docker.io
@@ -77,7 +81,7 @@ jobs:
         if: steps.check-build-needed.outputs.skipped != 'true'
       - id: build-and-push
         name: Push the image
-        run: ${{ matrix.build_cmd }} --push
+        run: ${{ matrix.build.cmd }} --push
         if: steps.check-build-needed.outputs.skipped != 'true'
         env:
           BUILDX_PLATFORM: ${{ matrix.platform }}