diff --git a/setup.py b/setup.py index 5f745231..28dea84e 100644 --- a/setup.py +++ b/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"' ], diff --git a/src/rotest/cli/client.py b/src/rotest/cli/client.py index adf3b335..0c6c7437 100644 --- a/src/rotest/cli/client.py +++ b/src/rotest/cli/client.py @@ -53,7 +53,8 @@ import pkg_resources from attrdict import AttrDict -django.setup() # noqa +if not hasattr(django, 'apps'): # noqa + django.setup() from rotest.core.suite import TestSuite from rotest.common import core_log diff --git a/src/rotest/cli/main.py b/src/rotest/cli/main.py index ab8671ae..a05c1793 100644 --- a/src/rotest/cli/main.py +++ b/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 diff --git a/src/rotest/core/runners/multiprocess/worker/process.py b/src/rotest/core/runners/multiprocess/worker/process.py index 2de6b6a0..7c33557f 100644 --- a/src/rotest/core/runners/multiprocess/worker/process.py +++ b/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