From ec9a3e80daa5efd2643c8e5127b04eea92383da5 Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Sat, 12 Apr 2025 10:26:09 +0200 Subject: [PATCH] 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