Merge branch 'master' into logging_fix

Author: Dmitriy Gumeniuk

README.rst

@@ -231,7 +231,7 @@ Copyright Notice
 ----------------
 ..  Copyright Notice:  https://github.com/reportportal/agent-python-pytest#copyright-notice
 
-Licensed under the GPLv3_ license (see the LICENSE file).
+Licensed under the `Apache 2.0`_ license (see the LICENSE file).
 
-.. _GPLv3:  https://www.gnu.org/licenses/quick-guide-gplv3.html
+.. _Apache 2.0:  https://www.apache.org/licenses/LICENSE-2.0
 

pytest_reportportal/errors.py

@@ -0,0 +1,11 @@
+"""This module includes exceptions used in the package."""
+
+
+class PytestWarning(UserWarning):
+    """Pytest warning exception.
+
+    This exception is about to stub absent PytestWarning in Pytest versions
+    up to 3.8.0. Get rid of this code once we drop support for Pytest versions
+    below 3.8.0.
+    """
+    pass

pytest_reportportal/listener.py

@@ -112,7 +112,7 @@ def _add_issue_info(self, item, report):
 
         issue_type = "TI" if issue_type is None else issue_type
 
-        if issue_type and self.PyTestService.issue_types \
+        if issue_type and getattr(self.PyTestService, 'issue_types', False) \
                 and (issue_type in self.PyTestService.issue_types):
             if comment:
                 self.issue['comment'] = comment

pytest_reportportal/service.py

@@ -7,10 +7,23 @@
 import pytest
 from _pytest.doctest import DoctestItem
 from _pytest.main import Session
-from _pytest.nodes import File, Item
+
+try:
+    pkg_resources.get_distribution('pytest >= 3.4.0')
+    from _pytest.nodes import File, Item
+except pkg_resources.VersionConflict:
+    from _pytest.main import File, Item
+
+try:
+    pkg_resources.get_distribution('pytest >= 3.8.0')
+    from _pytest.warning_types import PytestWarning
+except pkg_resources.VersionConflict:
+    from pytest_reportportal.errors import PytestWarning
+
+
 from _pytest.python import Class, Function, Instance, Module
 from _pytest.unittest import TestCaseFunction, UnitTestCase
-from _pytest.warning_types import PytestWarning
+
 from reportportal_client import ReportPortalServiceAsync
 from six import with_metaclass
 from six.moves import queue
@@ -94,8 +107,8 @@ def init_service(self, endpoint, project, uuid, log_batch_size,
                 token=uuid,
                 error_handler=self.async_error_handler,
                 retries=retries,
-                log_batch_size=log_batch_size  # ,
-                # verify_ssl=verify_ssl
+                log_batch_size=log_batch_size,
+                verify_ssl=verify_ssl
             )
             if self.RP and hasattr(self.RP.rp_client, "get_project_settings"):
                 self.project_settings = self.RP.rp_client.get_project_settings()