remove tests/__init__.py

Thomas Grainger · Thomas Grainger · commit 76fd987e7fcc · 2016-12-13T18:02:25.000Z
diff --git a/manage.py b/manage.py
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,2 @@
 [wheel]
 universal = 1
-
-[tool:pytest]
-DJANGO_SETTINGS_MODULE = tests.testproject.settings
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -0,0 +1,7 @@
+from django.conf import settings
+
+from testproject import settings as testproject_settings
+
+
+def pytest_configure():
+    settings.configure(**vars(testproject_settings))
diff --git a/tests/test_command.py b/tests/test_command.py
@@ -4,7 +4,7 @@
 from django.core.management import call_command
 
 TEST_LOCALE_DIR = pkg_resources.resource_filename(
-    'tests.testproject', 'locale'
+    'testproject', 'locale'
 )
 
 
diff --git a/tests/testproject/settings.py b/tests/testproject/settings.py
@@ -2,10 +2,10 @@
 
 SECRET_KEY = 'x'
 USE_I18N = True
-ROOT_URLCONF = 'tests.testproject.urls'
+ROOT_URLCONF = 'testproject.urls'
 INSTALLED_APPS = [
     'django_babel',
-    'tests.testproject',
+    'testproject',
 ]
 MIDDLEWARE_CLASSES = [
     'django.middleware.locale.LocaleMiddleware',

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`from django.core.management import call_command`
`5`	`5`
`6`	`6`	`TEST_LOCALE_DIR = pkg_resources.resource_filename(`
`7`		`- 'tests.testproject', 'locale'`
	`7`	`+ 'testproject', 'locale'`
`8`	`8`	`)`
`9`	`9`
`10`	`10`