Move test app outside of package for Django 1.9.

coleifer · Jan 22, 2016 · e6f2288 · e6f2288
1 parent 31a39f1
commit e6f2288
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 4 deletions.
diff --git a/...ion/generic_aggregation_tests/__init__.py → generic_aggregation_tests/__init__.py b/...ion/generic_aggregation_tests/__init__.py → generic_aggregation_tests/__init__.py
diff --git a/...regation_tests/migrations/0001_initial.py → ...regation_tests/migrations/0001_initial.py b/...regation_tests/migrations/0001_initial.py → ...regation_tests/migrations/0001_initial.py
diff --git a/..._aggregation_tests/migrations/__init__.py → ..._aggregation_tests/migrations/__init__.py b/..._aggregation_tests/migrations/__init__.py → ..._aggregation_tests/migrations/__init__.py
diff --git a/...ation/generic_aggregation_tests/models.py → generic_aggregation_tests/models.py b/...ation/generic_aggregation_tests/models.py → generic_aggregation_tests/models.py
diff --git a/...gation/generic_aggregation_tests/tests.py → generic_aggregation_tests/tests.py b/...gation/generic_aggregation_tests/tests.py → generic_aggregation_tests/tests.py
@@ -6,7 +6,7 @@
 
 from generic_aggregation import generic_annotate as _generic_annotate, generic_aggregate as _generic_aggregate, generic_filter as _generic_filter
 from generic_aggregation.utils import fallback_generic_annotate, fallback_generic_aggregate, fallback_generic_filter
-from generic_aggregation.generic_aggregation_tests.models import (
+from generic_aggregation_tests.models import (
     Food, Rating, CharFieldGFK
 )
 

diff --git a/runtests.py b/runtests.py
@@ -29,7 +29,7 @@
         },
         INSTALLED_APPS=[
             'django.contrib.contenttypes',
-            'generic_aggregation.generic_aggregation_tests',
+            'generic_aggregation_tests',
         ],
         MIDDLEWARE_CLASSES=(
             'django.contrib.sessions.middleware.SessionMiddleware',
@@ -40,7 +40,7 @@
         NULLS_ASC_SORT_FIRST=nulls_asc_sort_first,
     )
 
-app_to_test = 'generic_aggregation.generic_aggregation_tests'
+app_to_test = 'generic_aggregation_tests'
 
 from django.test.utils import get_runner
 

diff --git a/settings_migrations.py b/settings_migrations.py
@@ -7,7 +7,7 @@
 
 INSTALLED_APPS = [
     'django.contrib.contenttypes',
-    'generic_aggregation.generic_aggregation_tests',
+    'generic_aggregation_tests',
 ]
 
 MIDDLEWARE_CLASSES = (