diff --git a/.gitignore b/.gitignore index 399503ad..3bed89d2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ build/ dist/ .CondaPkg/ /jltest.* +uv.lock diff --git a/docs/src/releasenotes.md b/docs/src/releasenotes.md index 1bf50ec8..1c0be750 100644 --- a/docs/src/releasenotes.md +++ b/docs/src/releasenotes.md @@ -3,6 +3,7 @@ ## Unreleased * Added `PYTHON_JULIACALL_HEAP_SIZE_HINT` option to configure initial Julia heap size. * `Base.elsize` now defined for `PyArray`. +* JuliaCall now ensures a version of OpenSSL_jll compatible with Python is installed. ## 0.9.24 (2025-01-22) * Bug fixes. diff --git a/pyproject.toml b/pyproject.toml index 0fa9d417..afac6d46 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ classifiers = [ "Operating System :: OS Independent", ] requires-python = ">=3.8" -dependencies = ["juliapkg ~=0.1.8"] +dependencies = ["juliapkg ~=0.1.17"] [tool.hatch.build.targets.wheel] packages = ["pysrc/juliacall"] diff --git a/pysrc/juliacall/juliapkg-dev.json b/pysrc/juliacall/juliapkg-dev.json index 94e7e4e7..c222d7d0 100644 --- a/pysrc/juliacall/juliapkg-dev.json +++ b/pysrc/juliacall/juliapkg-dev.json @@ -1,11 +1,15 @@ { - "julia": "~1.6.1, ~1.7, ~1.8, ~1.9, =1.10.0, ^1.10.3", + "julia": "1.6.1 - 1.10.0, ^1.10.3", "packages": { "PythonCall": { "uuid": "6099a3de-0909-46bc-b1f4-468b9a2dfc0d", "version": "=0.9.24", "path": "../..", "dev": true + }, + "OpenSSL_jll": { + "uuid": "458c3c95-2e84-50aa-8efc-19380b2a3a95", + "version": "<=python" } } } diff --git a/pysrc/juliacall/juliapkg.json b/pysrc/juliacall/juliapkg.json index 43a5d588..e14a961e 100644 --- a/pysrc/juliacall/juliapkg.json +++ b/pysrc/juliacall/juliapkg.json @@ -1,9 +1,13 @@ { - "julia": "~1.6.1, ~1.7, ~1.8, ~1.9, =1.10.0, ^1.10.3", + "julia": "1.6.1 - 1.10.0, ^1.10.3", "packages": { "PythonCall": { "uuid": "6099a3de-0909-46bc-b1f4-468b9a2dfc0d", "version": "=0.9.24" + }, + "OpenSSL_jll": { + "uuid": "458c3c95-2e84-50aa-8efc-19380b2a3a95", + "version": "<=python" } } }