Merge pull request #53 from k01ek/dev

Dev

Author: k01ek

.github/workflows/pub-pypi.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   build-n-publish:
     name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@main
     - name: Set up Python 3.7

Makefile

@@ -1,5 +1,5 @@
 PYTHON_VER?=3.8
-NETBOX_VER?=v3.2.9
+NETBOX_VER?=v3.5.0
 
 NAME=netbox-qrcode
 

develop/Dockerfile

@@ -15,9 +15,6 @@ RUN git clone --single-branch --branch ${netbox_ver} https://github.com/netbox-c
     cd /opt/netbox/ && \
     pip install -r /opt/netbox/requirements.txt
 
-# Work around https://github.com/rq/django-rq/issues/421
-RUN pip install django-rq==2.3.2
-
 # -------------------------------------------------------------------------------------
 # Install Netbox Plugin
 # -------------------------------------------------------------------------------------

develop/dev.env

@@ -6,7 +6,7 @@ PGPASSWORD=sajdhasdj213jh1ss
 DB_HOST=postgres
 NAPALM_TIMEOUT=5
 MAX_PAGE_SIZE=0
-SECRET_KEY=QT4LOkwlMv66m5lN6j7z1gGOKpNsG5SWbB6p4PTAlLg2
+SECRET_KEY=QT4LOkwlMv66m5lN6j7z1gGOKpNsG5SWbB6p4PTAlLg2QT4LOkwlMv66m5lN6j7z1gGOKpNsG5SWbB6p4PTAlLg2
 POSTGRES_USER=netbox
 POSTGRES_PASSWORD=sajdhasdj213jh1ss
 POSTGRES_DB=netbox

netbox_qrcode/__init__.py

@@ -37,6 +37,9 @@ class QRCodeConfig(PluginConfig):
                 'b_terminations.device',
                 'b_terminations'
                 ]
+        },
+        'location': {
+            'text_fields': ['name']
         }
     }
 

netbox_qrcode/template_content.py

@@ -100,4 +100,11 @@ def left_page(self):
         return self.x_page()
 
 
-template_extensions = [DeviceQRCode, RackQRCode, CableQRCode]
+class LocationQRCode(QRCode):
+    model = 'dcim.location'
+
+    def left_page(self):
+        return self.x_page()
+
+
+template_extensions = [DeviceQRCode, RackQRCode, CableQRCode, LocationQRCode]

netbox_qrcode/version.py

@@ -1 +1 @@
-__version__ = "0.0.9"
+__version__ = "0.0.10"

setup.py

@@ -38,7 +38,7 @@ def get_version(rel_path):
     },
     install_requires=[
         'qrcode',
-        'Pillow'
+        'Pillow==9.5.0'
     ],
     classifiers=[
         'Development Status :: 2 - Pre-Alpha',