Merge branch 'release/2.29.0'

Author: vmalloc

.gitattributes

@@ -0,0 +1 @@
+/docs/changelog.rst merge=union

.gitignore

@@ -10,3 +10,5 @@ dist
 htmlcov
 .cache
 flycheck_*
+
+/.eggs

.pylintrc

@@ -0,0 +1,12 @@
+[MESSAGES CONTROL]
+disable=R,attribute-defined-outside-init,bad-continuation,bad-option-value,bare-except,invalid-name,locally-disabled,missing-docstring,redefined-builtin,ungrouped-imports,wrong-import-order,wrong-import-position
+
+[REPORTS]
+reports=no
+
+[TYPECHECK]
+ignored-classes=LookupDict,Archiveable,Commentable,MetadataHolder,WarningContainer
+
+
+[FORMAT]
+max-line-length=150

.travis.yml

@@ -1,15 +1,13 @@
 language: python
 python:
 - 2.7
-- 3.3
-- 3.4
 - 3.5
 - 3.6
 install:
 - pip install -U pip setuptools
-- pip install -r test_requirements.txt
-- pip install -e .
+- pip install -e .[testing]
 script:
+- pylint -j $(nproc) --rcfile=.pylintrc backslash tests
 - py.test tests
 deploy:
   provider: pypi

Makefile

@@ -3,13 +3,17 @@ default: test
 test: env
 	.env/bin/py.test -x tests --cov=backslash --cov-report=html
 
+doc: env
+	.env/bin/python setup.py build_sphinx -a -E
+
 env: .env/.up-to-date
 
 
 .env/.up-to-date: setup.py Makefile test_requirements.txt
 	virtualenv --no-site-packages .env
 	.env/bin/pip install -e .
 	.env/bin/pip install -r ./*.egg-info/requires.txt || true
+	.env/bin/pip install -r ./docs/requirements.txt
 	.env/bin/pip install -r test_requirements.txt
 	touch $@
 

backslash/__version__.py

@@ -1 +1,3 @@
-__version__ = '2.28.6'
+import pkg_resources
+
+__version__ = pkg_resources.get_distribution('backslash').version

backslash/api.py

@@ -3,7 +3,6 @@
 import json
 import random
 import time
-from sys import getsizeof
 
 import requests
 from requests.exceptions import ConnectionError, ReadTimeout
@@ -119,16 +118,16 @@ def delete(self, path, params=None):
         return resp
 
     def _normalize_return_value(self, response):
-        json = response.json()
-        if json is None:
+        json_res = response.json()
+        if json_res is None:
             return None
-        result = json.get('result')
+        result = json_res.get('result')
         if result is None:
-            if isinstance(json, dict):
-                for key, value in json.items():
+            if isinstance(json_res, dict):
+                for key, value in json_res.items():
                     if isinstance(value, dict) and value.get('type') == key:
                         return self.build_api_object(value)
-            return json
+            return json_res
         elif isinstance(result, dict) and 'type' in result:
             return self.build_api_object(result)
         return result

backslash/api_object.py

@@ -17,10 +17,10 @@ def ui_url(self):
     def __eq__(self, other):
         if not isinstance(other, APIObject):
             return NotImplemented
-        return self.client is other.client and self._data == other._data
+        return self.client is other.client and self._data == other._data  # pylint: disable=protected-access
 
     def __ne__(self, other):
-        return not (self == other)
+        return not (self == other)  # pylint: disable=superfluous-parens
 
     def __getattr__(self, name):
         try:

backslash/client.py

@@ -6,7 +6,6 @@
 from urlobject import URLObject as URL
 
 from .api import API
-from .compatibility import Compatibility
 from .lazy_query import LazyQuery
 
 
@@ -37,6 +36,8 @@ def delete_comment(self, comment_id):
 
     def report_session_start(self, logical_id=NOTHING,
                              parent_logical_id=NOTHING,
+                             is_parent_session=False,
+                             child_id=NOTHING,
                              hostname=NOTHING,
                              total_num_tests=NOTHING,
                              user_email=NOTHING,
@@ -59,11 +60,15 @@ def report_session_start(self, logical_id=NOTHING,
             'subjects': subjects,
             'infrastructure': infrastructure,
         }
-        if parent_logical_id is not None:
-            supports_parent_logical_id = (self.api.info().endpoints.report_session_start.version >= 2)
+        if parent_logical_id is not None or is_parent_session:
+            supports_parallel = (self.api.info().endpoints.report_session_start.version >= 2)
 
-            if supports_parent_logical_id:
+            if supports_parallel:
                 params['parent_logical_id'] = parent_logical_id
+                params['is_parent_session'] = is_parent_session
+                params['child_id'] = child_id
+                if child_id is not None:
+                    del params['total_num_tests']
 
         returned = self.api.call_function('report_session_start', params)
         return returned

backslash/comment.py

@@ -1,4 +1,5 @@
 from .api_object import APIObject
 
-class Comment(APIObject):
+
+class Comment(APIObject):  # pylint: disable=abstract-method
     pass