From fd92c91cac3b79b41b67a87226c8aff987f296f6 Mon Sep 17 00:00:00 2001 From: Christopher Doris Date: Tue, 13 May 2025 22:11:27 +0100 Subject: [PATCH 1/4] add openssl-compat for juliacall using juliapkg 0.1.17 --- pyproject.toml | 2 +- pysrc/juliacall/juliapkg-dev.json | 4 ++++ pysrc/juliacall/juliapkg.json | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) 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..a3af90be 100644 --- a/pysrc/juliacall/juliapkg-dev.json +++ b/pysrc/juliacall/juliapkg-dev.json @@ -6,6 +6,10 @@ "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..2e76f65b 100644 --- a/pysrc/juliacall/juliapkg.json +++ b/pysrc/juliacall/juliapkg.json @@ -4,6 +4,10 @@ "PythonCall": { "uuid": "6099a3de-0909-46bc-b1f4-468b9a2dfc0d", "version": "=0.9.24" + }, + "OpenSSL_jll": { + "uuid": "458c3c95-2e84-50aa-8efc-19380b2a3a95", + "version": "<=python" } } } From 89ba24923aff3b75f5cb4ca24daecb93898c38b9 Mon Sep 17 00:00:00 2001 From: Christopher Doris Date: Tue, 13 May 2025 22:17:08 +0100 Subject: [PATCH 2/4] use range specifiers --- pysrc/juliacall/juliapkg-dev.json | 2 +- pysrc/juliacall/juliapkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pysrc/juliacall/juliapkg-dev.json b/pysrc/juliacall/juliapkg-dev.json index a3af90be..c222d7d0 100644 --- a/pysrc/juliacall/juliapkg-dev.json +++ b/pysrc/juliacall/juliapkg-dev.json @@ -1,5 +1,5 @@ { - "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", diff --git a/pysrc/juliacall/juliapkg.json b/pysrc/juliacall/juliapkg.json index 2e76f65b..e14a961e 100644 --- a/pysrc/juliacall/juliapkg.json +++ b/pysrc/juliacall/juliapkg.json @@ -1,5 +1,5 @@ { - "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", From b102a9cbd1032bde1de1c31bf86c65f2bfa092f3 Mon Sep 17 00:00:00 2001 From: Christopher Doris Date: Tue, 13 May 2025 22:17:21 +0100 Subject: [PATCH 3/4] update gitignore for uv --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 399503ad..3bed89d2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ build/ dist/ .CondaPkg/ /jltest.* +uv.lock From 8fd339d9a0e5a62193ee7a2f6cc7872f0b7be04b Mon Sep 17 00:00:00 2001 From: Christopher Doris Date: Tue, 13 May 2025 22:19:45 +0100 Subject: [PATCH 4/4] update release notes --- docs/src/releasenotes.md | 1 + 1 file changed, 1 insertion(+) 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.