Merge branch 'release/B12_1_0' into bugfix/380061-removing-dependencies

Author: crazyeng

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Version 1.1.3
+- Async cloud evaluator based on `aiohttp` now use `certifi` to create a default `SSLContext` if none is provided. Other cloud evaluator are based on the `requests` module which also uses this library. 
+- Updating dependency list accordingly in `setup.py`. `certifi` was already listed as a `requests` dependency, so this should have no direct impact on user site package.
+# Version 1.1.3
 - Update asynchronous evaluator classes. Remove the `loop` parameter. Most optional loop parameters are deprecated in the Python standart library `asyncio` and in most libraries, mainly because it is misleading and lead to misuses and bugs. The loop parameter is useful when instantiating asynchronous evaluators outside the scope of an event loop. It's implementation was not good enough and was relying on usages deprecated in 3.8.
 - Removing four asynchronous generators in asynchronous evaluation result classes: `iter_messages`, `iter_messages_name`, `iter_messages_tuple` and `iter_output`. These coroutines are only working on python 3.6+ and are not critical enough to drop support for 3.5. Asynchronous properties: `messages`, `messages_name` and `output` provide the same information.
 

setup.py

@@ -67,6 +67,7 @@ def load_tests():
         'aiohttp',
         'oauthlib',
         'pyzmq',
+        'certifi>=2017.4.17' # for consistency with requests module.
     ],
     classifiers = CLASSIFIERS,
     project_urls={

wolframclient/about.py

@@ -2,6 +2,6 @@
 
 __name__ = "wolframclient"
 __description__ = "A Python library with various tools to interact with the Wolfram Language and the Wolfram Cloud."
-__version__ = "1.1.3"
+__version__ = "1.1.4"
 __author__ = "Wolfram Research"
 __author_email__ = "support@wolfram.com, dorianb@wolfram.com, riccardod@wolfram.com"

wolframclient/evaluation/cloud/asynccloudsession.py

@@ -11,7 +11,7 @@
     XAuthAIOHttpAsyncSession as XAuthAsyncSession,
 )
 from wolframclient.evaluation.cloud.base import WolframAPICallBase
-from wolframclient.evaluation.cloud.server import WOLFRAM_PUBLIC_CLOUD_SERVER
+from wolframclient.evaluation.cloud.server import WOLFRAM_PUBLIC_CLOUD_SERVER, DEFAULT_CA_PATH
 from wolframclient.evaluation.result import (
     WolframAPIResponseBuilder,
     WolframEvaluationWXFResponseAsync,
@@ -65,10 +65,12 @@ def __init__(
         if self.server.certificate is not None:
             self._ssl_context = self.ssl_context_class()
             self._ssl_context.load_verify_locations(self.server.certificate)
-            # self._ssl_context = ssl.create_default_context(cafile=self.server.certificate)
+        elif DEFAULT_CA_PATH:
+            self._ssl_context = ssl.create_default_context(cafile=DEFAULT_CA_PATH)
         else:
             self._ssl_context = None
 
+
     def duplicate(self):
         return self.__class__(
             credentials=self.credentials,

wolframclient/evaluation/cloud/asyncoauth.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 import logging
-
 from wolframclient.evaluation.cloud.base import OAuthAsyncSessionBase, UserIDPassword
+from wolframclient.evaluation.cloud.server import DEFAULT_CA_PATH
 from wolframclient.exception import AuthenticationException
 from wolframclient.utils import six
 from wolframclient.utils.api import aiohttp, oauth, ssl
@@ -35,7 +35,8 @@ def __init__(
         if self.server.certificate is not None:
             self._ssl_context = self.ssl_context_class()
             self._ssl_context.load_verify_locations(self.server.certificate)
-            # self._ssl_context = ssl.create_default_context(cafile=self.server.certificate)
+        elif DEFAULT_CA_PATH:
+            self._ssl_context = ssl.create_default_context(cafile=DEFAULT_CA_PATH)
         else:
             self._ssl_context = None
 

wolframclient/evaluation/cloud/server.py

@@ -1,8 +1,15 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 from wolframclient.utils import six
+try:
+    import certifi
+    DEFAULT_CA_PATH = certifi.where()
+except ImportError:
+    certifi = None
+    DEFAULT_CA_PATH = None
 
-__all__ = ["WolframServer"]
+
+__all__ = ["WolframServer", "DEFAULT_CA_PATH"]
 
 
 class WolframServer(object):

wolframclient/tests/evaluation/test_async_cloud.py

@@ -141,6 +141,14 @@ async def test_bad_sak_with(self):
             ) as cloud_session:
                 cloud_session.authorized()
 
+    def test_sslcontext(self):
+        from wolframclient.evaluation.cloud.server import DEFAULT_CA_PATH
+        s = WolframCloudAsyncSession()
+        if DEFAULT_CA_PATH is None:
+            self.assertIsNone(s._ssl_context)
+        else:
+            self.assertIsNotNone(s._ssl_context)
+
     @run_in_loop
     async def test_section_api_call_no_param(self):
         url = "api/private/requesterid"

wolframclient/utils/api.py

@@ -169,7 +169,10 @@
     StringPayload="aiohttp.StringPayload",
 )
 
-ssl = API(SSLContext="ssl.SSLContext")
+ssl = API(
+    SSLContext="ssl.SSLContext",
+    create_default_context="ssl.create_default_context",
+)
 
 externalevaluate = API(
     execute_from_file="wolframclient.utils.externalevaluate.execute_from_file",

wolframclient/utils/lock.py

@@ -4,6 +4,7 @@
 
 try:
     _lock = safe_import_string_and_call('multithreading.Lock')
+
     def Lock():
         return _lock
 
@@ -15,7 +16,8 @@ def Lock():
     from contextlib import contextmanager
     import warnings
 
+    warnings.warn("Lock is not implemented in the current interpreter.", RuntimeWarning)
+
     @contextmanager
     def Lock():
-        warnings.warn("Lock is not implemented in the current interpreter.", RuntimeWarning)
         yield