diff --git a/.github/workflows/code_analysis.yml b/.github/workflows/code_analysis.yml index e36a2f2f..c6a4d1b9 100644 --- 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 index decab2c3..289d0527 100644 --- 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 index 38b022f1..8315b5bf 100644 --- 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.*)$', + rf'^{re.escape(settings.MEDIA_URL.lstrip("/"))}(?P.*)$', serve, kwargs={"document_root": settings.MEDIA_ROOT}, ) diff --git a/tox.ini b/tox.ini index d475c5f3..af832842 100644 --- 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]