Merge branch 'openwisp:master' into upgrade_django

openwisp · Nov 2, 2023 · 39a7cd5 · 39a7cd5
2 parents 5e8d11b + 5840e4f
commit 39a7cd5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -125,10 +125,6 @@ jobs:
           pip install -U -r requirements-test.txt
           pip install tox docutils pygments twine
 
-      - name: QA checks
-        run: |
-          ./run-qa-checks
-
       - name: Tests
         run: |
           tox -e ${{ matrix.env.TOXENV }}
@@ -143,6 +139,11 @@ jobs:
            python-${{ matrix.env.env }}
           COVERALLS_PARALLEL: true
 
+      - name: QA checks
+        run: |
+          pip install "importlib-metadata<5.0"  # remove when flake8 is upgraded
+          ./run-qa-checks
+
   coveralls:
     name: Finish Coveralls
     needs: build

diff --git a/tests/settings.py b/tests/settings.py
@@ -81,6 +81,6 @@
 
 # local settings must be imported before test runner otherwise they'll be ignored
 try:
-    from local_settings import *
+    from local_settings import *  # noqa
 except ImportError:
     pass
diff --git a/tox.ini b/tox.ini
@@ -8,7 +8,6 @@ envlist =
 
 [testenv]
 usedevelop = true
-passenv = TRAVIS TRAVIS_*
 setenv =
     DJANGO_SETTINGS_MODULE=settings
     ; Hack: use an environment var to specify the test runner (to avoid using
@@ -34,3 +33,6 @@ deps =
     -rrequirements-test.txt
     pytest: pytest
     pytest: pytest-django
+
+[flake8]
+exclude = .tox