Merge branch 'master' into mips171/fix_208

openwisp · Jun 30, 2023 · d72a366 · d72a366
2 parents 767098c + 367ecfd
commit d72a366
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,10 +23,8 @@ jobs:
           - "3.10"
         django-version:
           - django~=3.2.0
-          - django~=4.0.0
-        include:
-          - django-version: django~=3.2.0
-            python-version: 3.7
+          - django~=4.1.0
+          - django~=4.2.0
 
     steps:
       - uses: actions/checkout@v2
@@ -55,12 +53,13 @@ jobs:
 
       - name: Install python dependencies
         run: |
-          pip install -U "pip==20.2.4" wheel setuptools
-          pip install -r requirements-test.txt
-          pip install ${{ matrix.django-version }}
+          pip install -U pip wheel setuptools
+          pip install -U -r requirements-test.txt
 
       - name: Install openwisp-firmware-upgrader
-        run: pip install -e .
+        run: |
+          pip install -U -e .
+          pip install ${{ matrix.django-version }}
 
       - name: QA checks
         run: |

diff --git a/README.rst b/README.rst
@@ -74,7 +74,7 @@ Installation instructions
 Requirements
 ~~~~~~~~~~~~
 
-- Python >= 3.7
+- Python >= 3.8
 - openwisp-controller (and its dependencies) >= 1.0.0
 
 Install Dependencies

diff --git a/openwisp_firmware_upgrader/__init__.py b/openwisp_firmware_upgrader/__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_firmware_upgrader.apps.FirmwareUpdaterConfig'
diff --git a/openwisp_firmware_upgrader/apps.py b/openwisp_firmware_upgrader/apps.py
@@ -70,3 +70,6 @@ def connect_device_signals(self):
             sender=FirmwareImage,
             dispatch_uid='firmware_image.auto_add_device_firmwares',
         )
+
+
+del ApiAppConfig
diff --git a/openwisp_firmware_upgrader/hardware.py b/openwisp_firmware_upgrader/hardware.py
@@ -63,6 +63,10 @@
                 'mvebu-cortexa9-linksys_wrt3200acm-squashfs-sysupgrade.img',
                 {'label': 'Linksys WRT3200ACM', 'boards': ('Linksys WRT3200ACM',)},
             ),
+            (
+                'ipq40xx-mikrotik-mikrotik_wap-ac-squashfs-sysupgrade.bin',
+                {'label': 'MikroTik wAP ac', 'boards': ('MikroTik wAP ac',)},
+            ),
             (
                 'brcm2708-bcm2709-rpi-2-ext4-sysupgrade.img.gz',
                 {
@@ -490,7 +494,12 @@
                 'x86-64-generic-squashfs-combined.img.gz',
                 {
                     'label': 'Generic x86/64 (QEMU/KVM)',
-                    'boards': ('x86_64', 'PC Engines APU2'),
+                    'boards': (
+                        'x86_64',
+                        'PC Engines APU2',
+                        'PC Engines apu2',
+                        'PC Engines apu6',
+                    ),
                 },
             ),
             (

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -1,5 +1,4 @@
 openwisp-utils[qa,selenium] @ https://github.com/openwisp/openwisp-utils/tarball/master
-redis~=4.2.2
 django-redis~=5.2.0
 mock-ssh-server~=0.8.0
-responses~=0.12.1
+responses~=0.23.1
diff --git a/setup.py b/setup.py
@@ -36,8 +36,7 @@
     zip_safe=False,
     install_requires=[
         'openwisp-controller @ https://github.com/openwisp/openwisp-controller/tarball/master',
-        'openwisp-utils[rest] @ https://github.com/openwisp/openwisp-utils/tarball/master',
-        'django-private-storage~=3.0.0',
+        'django-private-storage~=3.1.0',
     ],
     classifiers=[
         'Development Status :: 3 - Alpha',

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

diff --git a/tests/openwisp2/sample_firmware_upgrader/apps.py b/tests/openwisp2/sample_firmware_upgrader/apps.py
@@ -6,3 +6,6 @@ class SampleFirmwareUpgraderConfig(FirmwareUpdaterConfig):
     label = 'sample_firmware_upgrader'
     verbose_name = 'Firmware Upgrader (custom)'
     default_auto_field = 'django.db.models.AutoField'
+
+
+del FirmwareUpdaterConfig