Develop (#635)

Author: arthanson

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -11,25 +11,24 @@ body:
     attributes:
       label: pynetbox version
       description: What version of pynetbox are you currently running?
-      placeholder: v7.1.0
+      placeholder: v7.4.0
     validations:
       required: true
   - type: input
     attributes:
       label: NetBox version
       description: What version of NetBox are you currently running?
-      placeholder: v3.6.0
+      placeholder: v4.0.8
     validations:
       required: true
   - type: dropdown
     attributes:
       label: Python version
       description: What version of Python are you currently running?
       options:
-        - "3.8"
-        - "3.9"
         - "3.10"
         - "3.11"
+        - "3.12"
     validations:
       required: true
   - type: textarea

.github/workflows/py3.yml

@@ -12,8 +12,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["3.8", "3.9", "3.10", "3.11"]
-        netbox: ["3.4", "3.5", "3.6", "3.7"]
+        python: ["3.10", "3.11", "3.12"]
+        netbox: ["3.6", "3.7", "4.0"]
 
     steps:
       - uses: actions/checkout@v4

README.md

@@ -3,6 +3,19 @@ Python API client library for [NetBox](https://github.com/netbox-community/netbo
 
 > **Note:** Version 6.7 and later of the library only supports NetBox 3.3 and above.
 
+## Compatibility
+
+Each pyNetBox Version listed below has been tested with its corresponding NetBox Version.
+
+| NetBox Version | Plugin Version |
+|:--------------:|:--------------:|
+|      4.0.6     |     7.4.0      |
+|      4.0.0     |     7.3.4      |
+|      3.7       |     7.3.0      |
+|      3.6       |     7.2.0      |
+|      3.5       |     7.1.0      |
+|      3.3       |     7.0.0      |
+
 ## Installation
 
 To install run `pip install pynetbox`.

docs/conf.py

@@ -8,10 +8,10 @@
 # -- Project information -----------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
-project = 'pynetbox'
-copyright = '2023, NetBox'
-author = 'Abhimanyu Saharan'
-release = 'Apache2'
+project = "pynetbox"
+copyright = "2023, NetBox"
+author = "Abhimanyu Saharan"
+release = "Apache2"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

pynetbox/__init__.py

@@ -1,6 +1,4 @@
-from importlib.metadata import version
-
-from pynetbox.core.query import RequestError, AllocationError, ContentError
 from pynetbox.core.api import Api as api
+from pynetbox.core.query import AllocationError, ContentError, RequestError
 
-__version__ = version(__name__)
+__version__ = "7.4.0"

pynetbox/core/api.py

@@ -16,8 +16,8 @@
 
 import requests
 
-from pynetbox.core.query import Request
 from pynetbox.core.app import App, PluginsApp
+from pynetbox.core.query import Request
 from pynetbox.core.response import Record
 
 

pynetbox/core/app.py

@@ -17,12 +17,12 @@
 from pynetbox.core.endpoint import Endpoint
 from pynetbox.core.query import Request
 from pynetbox.models import (
-    dcim,
-    ipam,
-    virtualization,
     circuits,
+    dcim,
     extras,
+    ipam,
     users,
+    virtualization,
     wireless,
 )
 

pynetbox/core/endpoint.py

@@ -286,8 +286,9 @@ def filter(self, *args, **kwargs):
         offset = kwargs.pop("offset") if "offset" in kwargs else None
         if limit == 0 and offset is not None:
             raise ValueError("offset requires a positive limit value")
+        filters = {x: y if y is not None else "null" for x, y in kwargs.items()}
         req = Request(
-            filters=kwargs,
+            filters=filters,
             base=self.url,
             token=self.token,
             http_session=self.api.http_session,

pynetbox/core/query.py

@@ -16,6 +16,7 @@
 
 import concurrent.futures as cf
 import json
+
 from packaging import version
 
 

pynetbox/core/response.py

@@ -16,13 +16,12 @@
 
 import copy
 from collections import OrderedDict
+from urllib.parse import urlsplit
 
 import pynetbox.core.app
-from urllib.parse import urlsplit
 from pynetbox.core.query import Request
 from pynetbox.core.util import Hashabledict
 
-
 # List of fields that are lists but should be treated as sets.
 LIST_AS_SET = ("tags", "tagged_vlans")
 
@@ -68,7 +67,7 @@ def flatten_custom(custom_dict):
             current_val = val.get("id", val)
 
         if isinstance(val, list):
-            current_val = [v.get("id") if isinstance(v, dict) else v for v in val]
+            current_val = [v.get("id", v) if isinstance(v, dict) else v for v in val]
 
         ret[k] = current_val
     return ret