From 8253eade2a3f61c858608835fcaa7d2f11671a4f Mon Sep 17 00:00:00 2001 From: Damien Garros Date: Wed, 29 Jul 2020 17:47:35 -0400 Subject: [PATCH 1/2] Fix for Netbox issue 4910 --- development/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/development/Dockerfile b/development/Dockerfile index 4bdd11f..602937d 100644 --- a/development/Dockerfile +++ b/development/Dockerfile @@ -13,8 +13,11 @@ RUN pip install --upgrade pip\ # ------------------------------------------------------------------------------------- # Install NetBox # ------------------------------------------------------------------------------------- +# Remove redis==3.4.1 from the requirements.txt file as a workaround to #4910 +# https://github.com/netbox-community/netbox/issues/4910, required for version 2.8.8 and earlier RUN git clone --single-branch --branch ${netbox_ver} https://github.com/netbox-community/netbox.git /opt/netbox/ && \ cd /opt/netbox/ && \ + sed -i '/^redis\=\=/d' /opt/netbox/requirements.txt && \ pip install -r /opt/netbox/requirements.txt # Make the django-debug-toolbar always visible when DEBUG is enabled, From 0b8aac045f21c365b510eec259cbb0091f72f357 Mon Sep 17 00:00:00 2001 From: Damien Garros Date: Wed, 29 Jul 2020 17:53:29 -0400 Subject: [PATCH 2/2] Fix pydocstyle --- netbox_onboarding/onboard.py | 1 - 1 file changed, 1 deletion(-) diff --git a/netbox_onboarding/onboard.py b/netbox_onboarding/onboard.py index b436120..fe63c2a 100644 --- a/netbox_onboarding/onboard.py +++ b/netbox_onboarding/onboard.py @@ -562,7 +562,6 @@ def check_if_device_already_exist(self): def ensure_device(self): """Ensure that the device represented by the DevNetKeeper exists in the NetBox system.""" - # Only check the device role and device type if the device do not exist already if not self.check_if_device_already_exist(): self.ensure_device_type()