fixup! Add options for the Julia binary and project path

Author: JamesWrigley

.github/workflows/tests.yml

@@ -93,7 +93,6 @@ jobs:
 
       - name: Set up Julia
         id: setup_julia
-        if: ${{ matrix.juliaexe == 'julia' }}
         uses: julia-actions/setup-julia@v2
         with:
           version: '1'

docs/src/juliacall.md

@@ -135,7 +135,7 @@ be configured in two ways:
 | `-X juliacall-warn-overwrite=<yes\|no>` | `PYTHON_JULIACALL_WARN_OVERWRITE=<yes\|no>` | Enable or disable method overwrite warnings. |
 | `-X juliacall-autoload-ipython-extension=<yes\|no>` | `PYTHON_JULIACALL_AUTOLOAD_IPYTHON_EXTENSION=<yes\|no>` | Enable or disable IPython extension autoloading. |
 | `-X juliacall-heap-size-hint=<N>` | `PYTHON_JULIACALL_HEAP_SIZE_HINT=<N>` | Hint for initial heap size in bytes. |
-| `-X juliacall-exepath=<file>` | `PYTHON_JULIACALL_EXEPATH=<file>` | Path to Julia binary to use (overrides JuliaPkg). |
+| `-X juliacall-exe=<file>` | `PYTHON_JULIACALL_EXE=<file>` | Path to Julia binary to use (overrides JuliaPkg). |
 | `-X juliacall-project=<dir>` | `PYTHON_JULIACALL_PROJECT=<dir>` | Path to the Julia project to use (overrides JuliaPkg). |
 
 ## [Multi-threading](@id py-multi-threading)

pysrc/juliacall/__init__.py

@@ -110,7 +110,7 @@ def int_option(name, *, accept_auto=False, **kw):
             raise ValueError(f'{s}: expecting an int'+(' or auto' if accept_auto else ""))
 
     def args_from_config(config):
-        argv = [config['exe']]
+        argv = [config['exepath']]
         for opt, val in config.items():
             if opt.startswith('opt_'):
                 if val is None:
@@ -148,31 +148,31 @@ def args_from_config(config):
     CONFIG['opt_startup_file'] = choice('startup_file', ['yes', 'no'])[0]
     CONFIG['opt_heap_size_hint'] = option('heap_size_hint')[0]
     CONFIG['project'] = path_option('project', check_exists=True)[0]
-    CONFIG['exe'] = path_option('exe', check_exists=True)[0]
+    CONFIG['exepath'] = path_option('exe', check_exists=True)[0]
 
     # Stop if we already initialised
     if CONFIG['inited']:
         return
 
-    have_exe = CONFIG['exe'] is not None
+    have_exepath = CONFIG['exepath'] is not None
     have_project = CONFIG['project'] is not None
-    if not have_exe and not have_project:
+    if not have_exepath and not have_project:
         # we don't import this at the top level because it is not required when
         # juliacall is loaded by PythonCall and won't be available, or if both
-        # `exe` and `project` are set by the user.
+        # `exepath` and `project` are set by the user.
         import juliapkg
 
         # Find the Julia executable and project
-        CONFIG['exe'] = juliapkg.executable()
+        CONFIG['exepath'] = juliapkg.executable()
         CONFIG['project'] = juliapkg.project()
-    elif (not have_exe and have_project) or (have_exe and not have_project):
+    elif (not have_exepath and have_project) or (have_exepath and not have_project):
         raise Exception("Both PYTHON_JULIACALL_PROJECT and PYTHON_JULIACALL_EXE must be set together, not only one of them.")
 
-    exe = CONFIG['exe']
+    exepath = CONFIG['exepath']
     project = CONFIG['project']
 
     # Find the Julia library
-    cmd = [exe, '--project='+project, '--startup-file=no', '-O0', '--compile=min',
+    cmd = [exepath, '--project='+project, '--startup-file=no', '-O0', '--compile=min',
            '-e', 'import Libdl; print(abspath(Libdl.dlpath("libjulia")), "\\0", Sys.BINDIR)']
     libpath, default_bindir = subprocess.run(cmd, check=True, capture_output=True, encoding='utf8').stdout.split('\0')
     assert os.path.exists(libpath)