fixup! Add options for the Julia binary and project path

Author: JamesWrigley

.github/workflows/tests.yml

@@ -67,6 +67,14 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         pyversion: ["3", "3.9"]
+        jlinstaller: ["@JuliaPkg"]
+        include:
+        - arch: x64
+          os: ubuntu-latest
+          pyversion: 3
+          jlinstaller: manual
+      env:
+         MANUAL_TEST_PROJECT: /tmp/juliacall-test-project
 
     steps:
       - uses: actions/checkout@v5
@@ -82,10 +90,18 @@ jobs:
           python-version: ${{ matrix.pyversion }}
 
       - name: Set up Julia
+        id: setup_julia
+        if: ${{ matrix.jlinstaller == "manual" }}
         uses: julia-actions/setup-julia@v2
         with:
           version: '1'
 
+      - name: Set up test Julia project
+        if: ${{ matrix.jlinstaller == "manual" }}
+        run: |
+          mkdir ${{ MANUAL_TEST_PROJECT }}
+          julia --project=${{ MANUAL_TEST_PROJECT }} -e 'import Pkg; Pkg.dev(path="."); Pkg.instantiate()'
+
       - name: Install dependencies
         run: |
           cp pysrc/juliacall/juliapkg-dev.json pysrc/juliacall/juliapkg.json
@@ -104,6 +120,8 @@ jobs:
         env:
           PYTHON_JULIACALL_THREADS: '2'
           PYTHON_JULIACALL_HANDLE_SIGNALS: 'yes'
+          PYTHON_JULIACALL_EXE: "${{ steps.setup_julia.outputs.julia_bindir }}${{ matrix.jlinstaller == 'manual' && '/julia' || '' }}"
+          PYTHON_JULIACALL_PROJECT: "${{ matrix.jlinstaller == 'manual' && env.MANUAL_TEST_PROJECT || '' }}"
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5

pysrc/juliacall/__init__.py

@@ -147,15 +147,15 @@ def args_from_config(config):
     CONFIG['opt_handle_signals'] = choice('handle_signals', ['yes', 'no'])[0]
     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['project'] = path_option('project', default="", check_exists=True)[0]
+    CONFIG['exe'] = path_option('exe', default="", check_exists=True)[0]
 
     # Stop if we already initialised
     if CONFIG['inited']:
         return
 
-    have_exe = CONFIG['exe'] is not None
-    have_project = CONFIG['project'] is not None
+    have_exe = len(CONFIG['exe']) > 0
+    have_project = len(CONFIG['project']) > 0
     if not have_exe 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