diff --git a/mypy.ini b/mypy.ini --- a/mypy.ini +++ b/mypy.ini @@ -6,7 +6,7 @@ plugins = mypy_django_plugin.main, mypy_drf_plugin.main [mypy.plugins.django-stubs] -django_settings_module = swh.auth.tests.app.apptest.settings +django_settings_module = swh.auth.tests.django.app.apptest.settings # 3rd party libraries without stubs (yet) diff --git a/pytest.ini b/pytest.ini --- a/pytest.ini +++ b/pytest.ini @@ -1,3 +1,3 @@ [pytest] norecursedirs = docs .* -DJANGO_SETTINGS_MODULE = swh.auth.tests.app.apptest.settings +DJANGO_SETTINGS_MODULE = swh.auth.tests.django.app.apptest.settings diff --git a/swh/auth/tests/app/__init__.py b/swh/auth/tests/django/__init__.py rename from swh/auth/tests/app/__init__.py rename to swh/auth/tests/django/__init__.py diff --git a/swh/auth/tests/app/apptest/__init__.py b/swh/auth/tests/django/app/__init__.py rename from swh/auth/tests/app/apptest/__init__.py rename to swh/auth/tests/django/app/__init__.py diff --git a/swh/auth/tests/app/__init__.py b/swh/auth/tests/django/app/apptest/__init__.py rename from swh/auth/tests/app/__init__.py rename to swh/auth/tests/django/app/apptest/__init__.py diff --git a/swh/auth/tests/app/apptest/apps.py b/swh/auth/tests/django/app/apptest/apps.py rename from swh/auth/tests/app/apptest/apps.py rename to swh/auth/tests/django/app/apptest/apps.py --- a/swh/auth/tests/app/apptest/apps.py +++ b/swh/auth/tests/django/app/apptest/apps.py @@ -7,4 +7,4 @@ class TestApp(AppConfig): - name = "swh.auth.tests.app" + name = "swh.auth.tests.django.app.apptest" diff --git a/swh/auth/tests/app/apptest/models.py b/swh/auth/tests/django/app/apptest/models.py rename from swh/auth/tests/app/apptest/models.py rename to swh/auth/tests/django/app/apptest/models.py diff --git a/swh/auth/tests/app/apptest/settings.py b/swh/auth/tests/django/app/apptest/settings.py rename from swh/auth/tests/app/apptest/settings.py rename to swh/auth/tests/django/app/apptest/settings.py --- a/swh/auth/tests/app/apptest/settings.py +++ b/swh/auth/tests/django/app/apptest/settings.py @@ -3,5 +3,5 @@ INSTALLED_APPS = [ "django.contrib.auth", "django.contrib.contenttypes", - "swh.auth.tests.app.apptest.apps.TestApp", + "swh.auth.tests.django.app.apptest", ] diff --git a/swh/auth/tests/app/apptest/urls.py b/swh/auth/tests/django/app/apptest/urls.py rename from swh/auth/tests/app/apptest/urls.py rename to swh/auth/tests/django/app/apptest/urls.py diff --git a/swh/auth/tests/app/manage.py b/swh/auth/tests/django/app/manage.py rename from swh/auth/tests/app/manage.py rename to swh/auth/tests/django/app/manage.py --- a/swh/auth/tests/app/manage.py +++ b/swh/auth/tests/django/app/manage.py @@ -6,7 +6,7 @@ def main(): os.environ.setdefault( - "DJANGO_SETTINGS_MODULE", "swh.auth.tests.app.apptest.settings" + "DJANGO_SETTINGS_MODULE", "swh.auth.tests.django.app.apptest.settings" ) try: from django.core.management import execute_from_command_line diff --git a/swh/auth/tests/test_models.py b/swh/auth/tests/django/test_models.py rename from swh/auth/tests/test_models.py rename to swh/auth/tests/django/test_models.py --- a/swh/auth/tests/test_models.py +++ b/swh/auth/tests/django/test_models.py @@ -7,7 +7,7 @@ import pytest -from swh.auth.tests.app.apptest.models import AppUser +from .app.apptest.models import AppUser PERMISSIONS: Set[str] = set(["api", "app-label-read"]) NO_PERMISSION: Set[str] = set() diff --git a/swh/auth/tests/test_utils.py b/swh/auth/tests/django/test_utils.py rename from swh/auth/tests/test_utils.py rename to swh/auth/tests/django/test_utils.py