Merge branch 'master' into reorder-docs

openwisp · Aug 3, 2024 · 387eb21 · 387eb21
2 parents a7c3837 + aad28a8
commit 387eb21
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,12 +43,15 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
+        cache: 'pip'
+        cache-dependency-path: |
+          **/requirements*.txt
 
     - name: Install Dependencies
       id: deps
       run: |
-        sudo apt update
-        sudo apt-get -qq -y install sqlite3 gdal-bin
+        sudo apt -qq update
+        sudo apt -qq -y install sqlite3 gdal-bin
         pip install -U pip wheel setuptools
         pip install -U -r requirements-test.txt
         pip install -U -e .

diff --git a/openwisp_notifications/base/forms.py b/openwisp_notifications/base/forms.py
@@ -9,9 +9,11 @@ def __init__(self, *args, **kwargs):
         if instance:
             kwargs['initial'] = {
                 'web': instance.web_notification,
-                'email': instance.email_notification
-                if instance.web_notification
-                else instance.web_notification,
+                'email': (
+                    instance.email_notification
+                    if instance.web_notification
+                    else instance.web_notification
+                ),
             }
         super().__init__(*args, **kwargs)
         try: