Merge pull request #228 from EHDEN/fix/github_actions

Fix/GitHub actions
EHDEN · Apr 11, 2022 · 22d4d5f · 22d4d5f
2 parents 1cbaad0 + 8e2831e
commit 22d4d5f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/code_analysis.yml b/.github/workflows/code_analysis.yml
@@ -87,4 +87,5 @@ jobs:
         pip install -r requirements-dev/requirements-prospector.txt -r dashboard_viewer/requirements.txt
     - name: prospector
       run: |
-        prospector dashboard_viewer
+        export $(grep -v '^#' tests/.env | xargs -d '\n')
+        DJANGO_SETTINGS_MODULE=dashboard_viewer.settings prospector dashboard_viewer
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -39,4 +39,4 @@ jobs:
         export $(grep -v '^#' tests/.env | xargs -d '\n')
         cd dashboard_viewer
         python manage.py test --exclude-tag third-party-app
-        SINGLE_APPLICATION_MODE=n MAIN_APPLICATION_HOST=mainapp.host.com python manage.py test --tag third-party-app
+        #SINGLE_APPLICATION_MODE=n MAIN_APPLICATION_HOST=mainapp.host.com python manage.py test --tag third-party-app
diff --git a/dashboard_viewer/dashboard_viewer/urls.py b/dashboard_viewer/dashboard_viewer/urls.py
@@ -39,7 +39,7 @@
     path("martor/", include("martor.urls")),
     path("uploader/", include("uploader.urls")),
     re_path(
-        fr'^{re.escape(settings.MEDIA_URL.lstrip("/"))}(?P<path>.*)$',
+        rf'^{re.escape(settings.MEDIA_URL.lstrip("/"))}(?P<path>.*)$',
         serve,
         kwargs={"document_root": settings.MEDIA_ROOT},
     )

diff --git a/tox.ini b/tox.ini
@@ -25,8 +25,12 @@ commands = isort --check-only --diff dashboard_viewer
 deps =
     -r{toxinidir}/requirements-dev/requirements-prospector.txt
     -r{toxinidir}/dashboard_viewer/requirements.txt
+setenv =
+    DJANGO_SETTINGS_MODULE=dashboard_viewer.settings
 commands =
-    prospector dashboard_viewer
+    bash -c "export $(grep -v '^#' tests/.env | xargs -d '\n') && prospector dashboard_viewer"
+whitelist_externals =
+    bash
 
 # tests
 [testenv:tests]