Skip to content

Commit 108820d

Browse files
committed
passing arguments
1 parent 982abdc commit 108820d

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

wolframclient/cli/commands/start_externalevaluate.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ class Command(SimpleCommand):
1515
def add_arguments(self, parser):
1616
parser.add_argument("--port", dest="port", default=None)
1717
parser.add_argument("--installpath", dest="installpath", default=None)
18+
parser.add_argument("--kernelversion", dest="kernelversion", default=None)
1819

19-
def handle(self, port=None, installpath=None, **opts):
20+
def handle(self, port=None, installpath=None, kernelversion=None, **opts):
2021

21-
if installpath:
22-
os.environ["WOLFRAM_INSTALLATION_DIRECTORY"] = installpath
22+
for key, value in (("WOLFRAM_INSTALLATION_DIRECTORY", installpath), ("WOLFRAM_KERNEL_VERSION", kernelversion)):
23+
if value:
24+
os.environ[key] = value
2325

2426
try:
2527
zmq.Context

wolframclient/evaluation/kernel/kernelcontroller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from subprocess import PIPE, Popen
88
from threading import Event, RLock, Thread
99

10-
from wolframclient.evaluation.kernel.path import find_default_kernel_path
10+
from wolframclient.utils.environment import find_default_kernel_path
1111
from wolframclient.evaluation.kernel.zmqsocket import (
1212
Socket,
1313
SocketAborted,

wolframclient/serializers/encoder.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from collections import defaultdict
66
from functools import partial
77

8+
from wolframclient.utils.environment import installation_version
89
from wolframclient.serializers.utils import safe_len
910
from wolframclient.utils.api import multiprocessing, pkg_resources
1011
from wolframclient.utils.dispatch import Dispatch
@@ -205,7 +206,7 @@ def __init__(
205206
normalizer, encoder=safe_import_string(encoder or wolfram_encoder)
206207
)
207208
self.allow_external_objects = allow_external_objects
208-
self.target_kernel_version = target_kernel_version or 11.3
209+
self.target_kernel_version = target_kernel_version or installation_version()
209210
self._properties = kwargs
210211

211212
def chain_normalizer(self, func, encoder):

0 commit comments

Comments
 (0)