Skip to content

Commit a6a6726

Browse files
author
Christopher Doris
committed
nitpicks
1 parent ac95036 commit a6a6726

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ jobs:
6969
pyversion: ["3", "3.9"]
7070
juliaexe: ["@JuliaPkg"]
7171
include:
72-
- arch: x64
73-
os: ubuntu-latest
72+
- os: ubuntu-latest
7473
pyversion: 3
7574
juliaexe: julia
7675
env:

docs/src/releasenotes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Release Notes
22

33
## Unreleased
4+
* Added `PYTHON_JULIACALL_EXE` and `PYTHON_JULIACALL_PROJECT` for specifying the Julia binary and project to override JuliaPkg.
45
* Bug fixes.
56
* Internal: switch from Requires.jl to package extensions.
6-
* Added support for specifying the Julia binary and project to override JuliaPkg.
77

88
## 0.9.27 (2025-08-19)
99
* Internal: Use heap-allocated types (PyType_FromSpec) to improve ABI compatibility.

pysrc/juliacall/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ def args_from_config(config):
156156

157157
have_exepath = CONFIG['exepath'] is not None
158158
have_project = CONFIG['project'] is not None
159-
if not have_exepath and not have_project:
159+
if have_exepath and have_project:
160+
pass
161+
elif (not have_exepath) and (not have_project):
160162
# we don't import this at the top level because it is not required when
161163
# juliacall is loaded by PythonCall and won't be available, or if both
162164
# `exepath` and `project` are set by the user.
@@ -165,7 +167,7 @@ def args_from_config(config):
165167
# Find the Julia executable and project
166168
CONFIG['exepath'] = juliapkg.executable()
167169
CONFIG['project'] = juliapkg.project()
168-
elif (not have_exepath and have_project) or (have_exepath and not have_project):
170+
else:
169171
raise Exception("Both PYTHON_JULIACALL_PROJECT and PYTHON_JULIACALL_EXE must be set together, not only one of them.")
170172

171173
exepath = CONFIG['exepath']

0 commit comments

Comments
 (0)