Merge 58c79cb into 2ef5d6f

docs/intro/using_resources.rst

@@ -51,12 +51,33 @@ Don't forget to add the new application as well as ``rotest`` to the
 
 .. code-block:: python
 
-    from rotest.settings import *
-
-    INSTALLED_APPS += ['resources_app']  # Adding your apps to the settings
-
-    # You can override other definitions as well (optional),
-    # like DATABASES, MIDDLEWARE_CLASSES, etc.
+    DEBUG = True
+    INSTALLED_APPS += [
+        # Rotest related applications
+        'rotest.core',
+        'rotest.management',
+        'channels',
+
+        # Administrator related applications
+        'django.contrib.auth',
+        'django.contrib.contenttypes',
+        'django.contrib.sessions',
+        'django.contrib.sites',
+        'django.contrib.messages',
+        'django.contrib.staticfiles',
+        'django.contrib.admin',
+
+        # My applications
+        'resources_app']
+
+    # You can override other definitions (DATABASES, MIDDLEWARE_CLASSES, etc.)
+    # or just import them from rotest to use the default.
+    from rotest.common.django_utils.settings import (DATABASES,
+                                                     MIDDLEWARE_CLASSES,
+                                                     CHANNEL_LAYERS,
+                                                     ASGI_APPLICATION,
+                                                     TEMPLATES,
+                                                     STATIC_URL)
 
 We're going to write a simple resource of a calculator. Edit the
 :file:`resources_app/models.py` file to have the following content:

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 
-__version__ = "7.8.0"
+__version__ = "7.8.1"
 
 result_handlers = [
     "db = rotest.core.result.handlers.db_handler:DBHandler",
@@ -49,7 +49,6 @@
         'swaggapi>=0.6.7',
         'cached_property',
         'channels>=1,<2',
-        'websocket>=0.2',
         'websocket-client>=0.56',
         'pywin32<224; sys.platform == "win32"'
     ],

src/rotest/__init__.py

@@ -7,7 +7,6 @@
 
 from .common import config
 from .cli.client import main
-from .common.django_utils import settings
 
 
 # Enable color printing on screen.

src/rotest/cli/main.py

@@ -4,7 +4,8 @@
 import sys
 
 import django
-django.setup()  # noqa
+if not hasattr(django, 'apps'):  # noqa
+    django.setup()
 
 from rotest.cli.client import main as run
 from rotest.cli.server import start_server

src/rotest/core/runners/multiprocess/worker/process.py

@@ -8,7 +8,8 @@
 import psutil
 from six.moves import queue
 
-django.setup()  # noqa
+if not hasattr(django, 'apps'):  # noqa
+    django.setup()
 
 from rotest.common import core_log
 from rotest.core.runners.multiprocess.worker.runner import WorkerRunner