Merge b3d82bb into 2138eca

.gitignore

@@ -101,6 +101,7 @@ ENV/
 .mypy_cache/
 
 .idea/
+test_rotest_db-journal
 rotest_db
 rotest_test
 rotest_test-journal

.travis.yml

@@ -1,4 +1,6 @@
 language: python
+sudo: required
+dist: xenial
 stages:
   - test
   - name: deploy
@@ -7,6 +9,7 @@ python:
 - '2.7'
 - '3.5'
 - '3.6'
+- '3.7'
 install: pip install tox coveralls
 script: tox -e $(echo py$TRAVIS_PYTHON_VERSION | tr -d .)
 after_success: coveralls
@@ -17,6 +20,11 @@ jobs:
     python: '3.6'
     install: pip install tox
     script: tox -e docs
+  - name: validate requirements
+    stage: test
+    python: '2.7'
+    install: pip install tox
+    script: tox -e validate_requirements
   - stage: deploy
     python: '3.6'
     install: skip

appveyor.yml

@@ -3,6 +3,7 @@ environment:
   - TOXENV: "py27"
   - TOXENV: "py35"
   - TOXENV: "py36"
+  - TOXENV: "py37"
 
 build: off
 

pylintrc

@@ -52,7 +52,9 @@ confidence=
 # --disable=W"
 disable=bad-continuation,no-member,missing-docstring,relative-import,
         invalid-name,too-few-public-methods,duplicate-code,cyclic-import,
-        len-as-condition,arguments-differ,unbalanced-tuple-unpacking
+        len-as-condition,arguments-differ,unbalanced-tuple-unpacking,
+        unnecessary-pass,keyword-arg-before-vararg,
+        inconsistent-return-statements
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

requirements.txt

@@ -1,70 +1,62 @@
-astroid==1.5.3
+astroid==1.6.5
+atomicwrites==1.2.1
 attrdict==2.0.0
-attrs==17.2.0
-Automat==0.6.0
-backports.functools-lru-cache==1.4
+attrs==18.2.0
+backports.functools-lru-cache==1.5
 backports.shutil-get-terminal-size==1.0.0
 basicstruct==1.0.3
-certifi==2018.10.15
+certifi==2018.11.29
 chardet==3.0.4
-colorama==0.3.9
+colorama==0.4.1
 configparser==3.5.0
-constantly==15.1.0
-coverage==4.5.1
-decorator==4.1.2
+coverage==4.5.2
+decorator==4.3.0
 Django==1.8.19
-docopt==0.6.2
-docutils==0.14
 enum34==1.1.6
-flake8==3.5.0
+flake8==3.6.0
 funcsigs==1.0.2
-functools32==3.2.3.post2; python_version < '3'
-future==0.16.0
-hyperlink==17.3.1
-idna==2.6
-incremental==17.5.0
-ipdb==0.10.3
+functools32==3.2.3.post2
+future==0.17.1
+futures==3.2.0
+idna==2.7
+ipdb==0.11
 ipdbugger==2.0.3
-ipython==5.5.0
+ipython==5.8.0
 ipython-genutils==0.2.0
-isort==4.2.15
+isort==4.3.4
 jsonschema==2.6.0
 lazy-object-proxy==1.3.1
-lockfile==0.12.2
-lxml==3.8.0
 mccabe==0.6.1
 mock==2.0.0
-pathlib2==2.3.0
-pbr==3.1.1
-pexpect==4.2.1
-pickleshare==0.7.4
+more-itertools==4.3.0
+pathlib2==2.3.3
+pbr==5.1.1
+pexpect==4.6.0
+pickleshare==0.7.5
+pluggy==0.8.0
 prompt-toolkit==1.0.15
-psutil==5.3.1
-ptyprocess==0.5.2
-py==1.4.34
-pycodestyle==2.3.1
-pyfakefs==3.4.1
-pyflakes==1.5.0
-Pygments==2.2.0
-pylint==1.7.6
-pytest==3.2.2
-pytest-cov==2.5.1
-pytest-django==3.1.2
-python-daemon==2.1.2
-PyYAML==3.12
-requests==2.18.4
-scandir==1.5
+psutil==5.4.8
+ptyprocess==0.6.0
+py==1.7.0
+pycodestyle==2.4.0
+pyfakefs==3.5.3
+pyflakes==2.0.0
+Pygments==2.3.0
+pylint==1.9.3
+pytest==4.0.1
+pytest-cov==2.6.0
+pytest-django==3.4.4
+PyYAML==3.13
+requests==2.20.1
+scandir==1.9.0
 simplegeneric==0.8.1
 singledispatch==3.4.0.3
 six==1.11.0
 swaggapi==0.6.5
 termcolor==1.1.0
 traitlets==4.3.2
-Twisted==17.5.0
-urllib3==1.22
+urllib3==1.24.1
 wcwidth==0.1.7
 wrapt==1.10.11
 xlrd==1.1.0
 xlwt==1.3.0
-xmltodict==0.11.0
-zope.interface==4.4.3

setup.py

@@ -23,27 +23,6 @@
     "rotest.core.result.handlers.stream.stream_handler:EventStreamHandler",
 ]
 
-requirements = [
-    'django>=1.8,<1.9',
-    'ipdb',
-    'py',
-    'isort',
-    'ipdbugger>=2',
-    'docopt',
-    'xlwt',
-    'attrdict',
-    'pyyaml',
-    'twisted',
-    'psutil',
-    'colorama',
-    'termcolor',
-    'jsonschema',
-    'basicstruct',
-    'future',
-    'swaggapi>=0.6.5',
-    'python-daemon;platform_system!="Windows"'
-]
-
 setup(
     name='rotest',
     version=__version__,
@@ -54,7 +33,35 @@
     author_email="gregoil@walla.co.il",
     url="https://github.com/gregoil/rotest",
     keywords="testing system django unittest",
-    install_requires=requirements,
+    install_requires=[
+        'django>=1.8,<1.9',
+        'py',
+        'isort',
+        'ipdbugger>=2',
+        'xlwt',
+        'attrdict',
+        'pyyaml',
+        'psutil',
+        'colorama',
+        'termcolor',
+        'jsonschema',
+        'basicstruct',
+        'future',
+        'swaggapi>=0.6.5',
+    ],
+    extras_require={
+        "dev": [
+            "pytest",
+            "pytest-django",
+            "pytest-cov",
+            "mock",
+            "pyfakefs",
+            "xlrd",
+            "pathlib2",
+            "flake8",
+            "pylint",
+        ]
+    },
     python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*",
     entry_points={
         "console_scripts": [
@@ -77,6 +84,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX',
         'Operating System :: Unix',

src/rotest/cli/client.py

@@ -46,6 +46,7 @@
 import argparse
 from itertools import chain
 
+import six
 import django
 import pkg_resources
 from attrdict import AttrDict
@@ -59,7 +60,6 @@
 from rotest.core.runner import (DEFAULT_CONFIG_PATH, parse_config_file,
                                 update_resource_requests, run as rotest_runner,
                                 parse_resource_identifiers)
-import six
 
 
 def parse_outputs_option(outputs):

src/rotest/core/flow_component.py

@@ -300,7 +300,7 @@ def is_failing(self):
                 self.data.exception_type not in TestOutcome.POSITIVE_RESULTS:
             return True
 
-        elif self.mode in (MODE_OPTIONAL,) and \
+        if self.mode in (MODE_OPTIONAL,) and \
                 self.data.exception_type not in TestOutcome.UNCRITICAL_RESULTS:
             return True
 

src/rotest/core/models/case_data.py

@@ -1,6 +1,6 @@
 """Define CaseData model class."""
+# pylint: disable=too-many-public-methods,no-init
 # pylint: disable=no-member,no-init,too-few-public-methods
-# pylint: disable=too-many-public-methods,no-init,old-style-class
 from __future__ import absolute_import
 
 from django.db import models

src/rotest/core/models/general_data.py

@@ -1,5 +1,5 @@
 """Define GeneralData model class."""
-# pylint: disable=no-init,old-style-class,unused-argument
+# pylint: disable=no-init,unused-argument
 from __future__ import absolute_import
 
 from datetime import datetime

src/rotest/core/models/run_data.py

@@ -1,5 +1,5 @@
 """Define RunData model class."""
-# pylint: disable=too-few-public-methods,no-init,old-style-class
+# pylint: disable=too-few-public-methods,no-init
 from __future__ import absolute_import
 
 from django.db import models

src/rotest/core/models/signature.py

@@ -1,5 +1,5 @@
 """Define SignatureData model class."""
-# pylint: disable=no-init,old-style-class
+# pylint: disable=no-init
 from __future__ import absolute_import
 
 import re

src/rotest/core/models/suite_data.py

@@ -1,5 +1,5 @@
 """Define SuiteData model class."""
-# pylint: disable=no-init,old-style-class
+# pylint: disable=no-init
 from future.builtins import object
 
 from .general_data import GeneralData

src/rotest/core/result/handlers/excel_handler.py

@@ -5,6 +5,7 @@
 import os
 from collections import OrderedDict
 
+import six
 import xlwt
 from xlwt.Style import easyxf
 from future.builtins import str
@@ -17,8 +18,6 @@
 from rotest.core.result.handlers.remote_db_handler import RemoteDBHandler
 from rotest.core.result.handlers.abstract_handler import AbstractResultHandler
 
-import six
-
 
 class ExcelHandler(AbstractResultHandler):
     """Excel result handler.

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

@@ -1,5 +1,6 @@
 """Multiprocess worker process."""
-# pylint: disable=invalid-name,too-many-arguments,too-many-instance-attributes
+# pylint: disable=invalid-name,too-many-arguments
+# pylint: disable=too-many-locals,too-many-instance-attributes
 from __future__ import absolute_import
 from multiprocessing import Process
 

src/rotest/management/client/result_client.py

@@ -7,13 +7,24 @@
 additional data about the run.
 """
 from __future__ import absolute_import
+
+import six
+
+from rotest.common import core_log
+from rotest.common.config import RESOURCE_MANAGER_HOST
+from rotest.management.client.client import AbstractClient
+from rotest.api.common.responses import FailureResponseModel
+from rotest.management.common.resource_descriptor import ResourceDescriptor
+from rotest.management.common.utils import (TEST_ID_KEY,
+                                            TEST_NAME_KEY,
+                                            TEST_SUBTESTS_KEY,
+                                            TEST_CLASS_CODE_KEY)
 from rotest.api.common.models import (SetSessionTimeoutModel,
                                       StartTestRunParamsModel,
                                       UpdateRunDataParamsModel,
                                       AddTestResultParamsModel,
                                       TestControlOperationParamsModel,
                                       UpdateResourcesParamsModel)
-from rotest.api.common.responses import FailureResponseModel
 from rotest.api.test_control import (StartTestRun,
                                      UpdateRunData,
                                      AddTestResult,
@@ -25,16 +36,6 @@
                                      StartComposite,
                                      StopComposite)
 
-from rotest.common import core_log
-from rotest.common.config import RESOURCE_MANAGER_HOST
-from rotest.management.client.client import AbstractClient
-from rotest.management.common.resource_descriptor import ResourceDescriptor
-from rotest.management.common.utils import (TEST_ID_KEY,
-                                            TEST_NAME_KEY,
-                                            TEST_SUBTESTS_KEY,
-                                            TEST_CLASS_CODE_KEY)
-import six
-
 
 class ClientResultManager(AbstractClient):
     """Client side result manager.

src/rotest/management/common/parsers/abstract_parser.py

@@ -2,9 +2,10 @@
 from __future__ import absolute_import
 from abc import ABCMeta, abstractmethod
 
-from rotest.management.common.messages import AbstractMessage
 import six
 
+from rotest.management.common.messages import AbstractMessage
+
 
 class ParsingError(Exception):
     pass

src/rotest/management/common/resource_descriptor.py

@@ -3,6 +3,7 @@
 
 from inspect import isclass
 
+import six
 from future.builtins import object
 
 from rotest.management import ResourceData
@@ -11,7 +12,6 @@
                                             PROPERTIES,
                                             extract_type,
                                             extract_type_path)
-import six
 
 
 class ResourceDescriptor(object):