Merge pull request #253 in LCL/wolframclientforpython from bugfix/429973-python-date to master

* commit '7c6a3ed09b8d7597ec4f9ac741ba58fa2b2684e5':
  bumping version
  passing arguments
  adding installation_version, refactoring internals
  moving module

Author: crazyeng

PacletInfo.m

@@ -1,6 +1,6 @@
 Paclet[
     Name -> "WolframClientForPython",
-    Version -> "1.1.5",
+    Version -> "1.1.8",
     MathematicaVersion -> "12.3+",
     Loading -> Automatic,
     Extensions -> {}

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.7"
+__version__ = "1.1.8"
 __author__ = "Wolfram Research"
 __author_email__ = "support@wolfram.com, dorianb@wolfram.com, riccardod@wolfram.com"

wolframclient/cli/commands/start_externalevaluate.py

@@ -15,11 +15,13 @@ class Command(SimpleCommand):
     def add_arguments(self, parser):
         parser.add_argument("--port", dest="port", default=None)
         parser.add_argument("--installpath", dest="installpath", default=None)
+        parser.add_argument("--kernelversion", dest="kernelversion", default=None)
 
-    def handle(self, port=None, installpath=None, **opts):
+    def handle(self, port=None, installpath=None, kernelversion=None, **opts):
 
-        if installpath:
-            os.environ["WOLFRAM_INSTALLATION_DIRECTORY"] = installpath
+        for key, value in (("WOLFRAM_INSTALLATION_DIRECTORY", installpath), ("WOLFRAM_KERNEL_VERSION", kernelversion)):
+            if value:
+                os.environ[key] = value
 
         try:
             zmq.Context

wolframclient/evaluation/kernel/kernelcontroller.py

@@ -7,7 +7,7 @@
 from subprocess import PIPE, Popen
 from threading import Event, RLock, Thread
 
-from wolframclient.evaluation.kernel.path import find_default_kernel_path
+from wolframclient.utils.environment import find_default_kernel_path
 from wolframclient.evaluation.kernel.zmqsocket import (
     Socket,
     SocketAborted,

wolframclient/serializers/encoder.py

@@ -5,6 +5,7 @@
 from collections import defaultdict
 from functools import partial
 
+from wolframclient.utils.environment import installation_version
 from wolframclient.serializers.utils import safe_len
 from wolframclient.utils.api import multiprocessing, pkg_resources
 from wolframclient.utils.dispatch import Dispatch
@@ -205,7 +206,7 @@ def __init__(
             normalizer, encoder=safe_import_string(encoder or wolfram_encoder)
         )
         self.allow_external_objects = allow_external_objects
-        self.target_kernel_version = target_kernel_version or 11.3
+        self.target_kernel_version = target_kernel_version or installation_version()
         self._properties = kwargs
 
     def chain_normalizer(self, func, encoder):

wolframclient/evaluation/kernel/path.py wolframclient/utils/environment.pywolframclient/evaluation/kernel/path.py renamed to wolframclient/utils/environment.py

@@ -3,8 +3,18 @@
 from wolframclient.utils import six
 from wolframclient.utils.api import os
 
+from wolframclient.utils import six
+from wolframclient.utils.api import os
+
+def installation_version():
 
-def explore_paths(*paths):
+    v = os.environ.get('WOLFRAM_KERNEL_VERSION', None)
+    if v:
+        return float(v)
+
+    return 12.0
+
+def _explore_paths(*paths):
     highest_version = -1
     best_path = None
     for root in paths:
@@ -23,21 +33,21 @@ def explore_paths(*paths):
         yield best_path
 
 
-def installation_directories():
+def _installation_directories():
     env = os.environ.get("WOLFRAM_INSTALLATION_DIRECTORY", None)
     if env:
         yield env
 
     if six.WINDOWS:
-        for p in explore_paths(
+        for p in _explore_paths(
             "C:\\Program Files\\Wolfram Research\\Wolfram Desktop",
             "C:\\Program Files\\Wolfram Research\\Mathematica",
             "C:\\Program Files\\Wolfram Research\\Wolfram Engine",
         ):
             yield p
 
     elif six.LINUX:
-        for p in explore_paths(
+        for p in _explore_paths(
             "/usr/local/Wolfram/Desktop",
             "/usr/local/Wolfram/Mathematica",
             "/usr/local/Wolfram/WolframEngine",
@@ -50,19 +60,19 @@ def installation_directories():
         yield "/Applications/Wolfram Engine.app/Contents"
 
 
-def exe_path():
+
+def find_default_kernel_path():
+    """ Look for the most recent installed kernel. """
+
     if six.WINDOWS:
-        return "WolframKernel.exe"
+        rel = "WolframKernel.exe"
     elif six.LINUX:
-        return "Executables/WolframKernel"
+        rel =  "Executables/WolframKernel"
     elif six.MACOS:
-        return "MacOS/WolframKernel"
+        rel =  "MacOS/WolframKernel"
+    
 
-
-def find_default_kernel_path():
-    """ Look for the most recent installed kernel. """
-    rel = exe_path()
-    for path in installation_directories():
+    for path in _installation_directories():
         if rel:
             path = os.path_join(path, rel)
         if os.isfile(path):