[deps] Added support for Django 4.1.0 and 4.2.0

- Added support for Django 4.1.0 and 4.2.0 - Dropped support for Django 4.0.0
openwisp · Jun 20, 2023 · f2df406 · f2df406
1 parent e363f0b
commit f2df406
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,8 @@ jobs:
           - "3.10"
         django-version:
           - django~=3.2.0
-          - django~=4.0.0
+          - django~=4.1.0
+          - django~=4.2.0
 
     steps:
       - name: Install system packages
@@ -66,7 +67,7 @@ jobs:
 
       - name: Install openwisp-network-topology
         run: |
-          pip install -e .
+          pip install -U -e .
           pip install ${{ matrix.django-version }}
 
       - name: QA checks

diff --git a/openwisp_network_topology/__init__.py b/openwisp_network_topology/__init__.py
@@ -16,6 +16,3 @@ def get_version():
                 rev = 0
             version = '%s%s%s' % (version, VERSION[3][0:1], rev)
     return version
-
-
-default_app_config = 'openwisp_network_topology.apps.OpenwispNetworkTopologyConfig'
diff --git a/openwisp_network_topology/integrations/device/__init__.py b/openwisp_network_topology/integrations/device/__init__.py
@@ -1,3 +0,0 @@
-default_app_config = (
-    'openwisp_network_topology.integrations.device.apps.OpenwispTopologyDeviceConfig'
-)

diff --git a/openwisp_network_topology/integrations/device/admin.py b/openwisp_network_topology/integrations/device/admin.py
@@ -16,4 +16,4 @@ class WifiMeshInlineAdmin(admin.StackedInline):
 
 
 if app_settings.WIFI_MESH_INTEGRATION:
-    TopologyAdmin.inlines = TopologyAdmin.inlines + [WifiMeshInlineAdmin]
+    TopologyAdmin.inlines = list(TopologyAdmin.inlines) + [WifiMeshInlineAdmin]
diff --git a/openwisp_network_topology/integrations/device/base/models.py b/openwisp_network_topology/integrations/device/base/models.py
@@ -109,14 +109,7 @@ def auto_create_wireguard(cls, node):
         ip_addresses = []
         for ip in allowed_ips:
             try:
-                network = ip_network(ip)
-                if network.prefixlen == network._max_prefixlen:
-                    # In python 3.7, hosts method is not returning any ip
-                    # if subnet mask is 32, resolved in future python releases
-                    # https://bugs.python.org/issue28577
-                    ip_addresses.append(str(network.network_address))
-                else:
-                    ip_addresses.extend([str(host) for host in ip_network(ip).hosts()])
+                ip_addresses.extend([str(host) for host in ip_network(ip).hosts()])
             except ValueError:
                 # invalid IP address
                 continue

diff --git a/openwisp_network_topology/static/netjsongraph/css/admin.css b/openwisp_network_topology/static/netjsongraph/css/admin.css
@@ -31,3 +31,13 @@ input[type='text'].readonly {
 .submit-row .visualizelink:focus {
     background: #576a7c;
 }
+
+/*
+The CSS for "hidden" class in Django >= 4.1 sets
+"display: none !important". This hides the
+"sideBarHandle" button. Thus, we unset the display
+property below.
+*/
+.njg-sideBar.hidden {
+    display: unset !important;
+}
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -1,5 +1,5 @@
-responses~=0.16.0
-pytest-asyncio~=0.14.0
+responses~=0.23.1
+pytest-asyncio~=0.21.0
 pytest-django~=4.5.2
 freezegun~=1.1.0
 # Needed to test integrations

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,3 @@
-django>=3.0,<4.1
 openwisp-users @ https://github.com/openwisp/openwisp-users/tarball/master
 netdiff @ https://github.com/openwisp/netdiff/tarball/master
 jsonfield~=3.1.0

diff --git a/tests/openwisp2/sample_integration_device/__init__.py b/tests/openwisp2/sample_integration_device/__init__.py
@@ -1,3 +0,0 @@
-default_app_config = (
-    'openwisp2.sample_integration_device.apps.OpenwispTopologyDeviceConfig'
-)

diff --git a/tests/openwisp2/sample_integration_device/apps.py b/tests/openwisp2/sample_integration_device/apps.py
@@ -6,3 +6,6 @@
 class OpenwispTopologyDeviceConfig(BaseAppConfig):
     name = 'openwisp2.sample_integration_device'
     label = 'sample_integration_device'
+
+
+del BaseAppConfig
diff --git a/tests/openwisp2/sample_network_topology/__init__.py b/tests/openwisp2/sample_network_topology/__init__.py
@@ -1,3 +0,0 @@
-default_app_config = (
-    'openwisp2.sample_network_topology.apps.SampleNetworkTopologyConfig'
-)

diff --git a/tests/openwisp2/sample_network_topology/apps.py b/tests/openwisp2/sample_network_topology/apps.py
@@ -4,3 +4,6 @@
 class SampleNetworkTopologyConfig(OpenwispNetworkTopologyConfig):
     name = 'openwisp2.sample_network_topology'
     label = 'sample_network_topology'
+
+
+del OpenwispNetworkTopologyConfig