From 86cc15d9964f9e779605acf2ae66930a8e686763 Mon Sep 17 00:00:00 2001 From: Chris Lovering Date: Wed, 30 Jul 2025 10:39:40 +0100 Subject: Upgrade pyenv to 2.6.5 for access to latest Python versions --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 785f165..f034880 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN apt-get -y update \ tk-dev \ && rm -rf /var/lib/apt/lists/* -RUN git clone -b v2.6.0 --depth 1 https://github.com/pyenv/pyenv.git $PYENV_ROOT +RUN git clone -b v2.6.5 --depth 1 https://github.com/pyenv/pyenv.git $PYENV_ROOT COPY --link scripts/build_python.sh / -- cgit v1.2.3 From abe9d246f9487c5e1d82dca51017d9da2d5a8375 Mon Sep 17 00:00:00 2001 From: Chris Lovering Date: Wed, 30 Jul 2025 10:40:09 +0100 Subject: Upgrade Python within snadbox to latest 3.13 & 3.14 versions --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f034880..c08eb4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,13 +35,13 @@ COPY --link scripts/build_python.sh / # ------------------------------------------------------------------------------ FROM builder-py-base AS builder-py-3_13 -RUN /build_python.sh 3.13.2 +RUN /build_python.sh 3.13.5 # ------------------------------------------------------------------------------ FROM builder-py-base AS builder-py-3_13t RUN /build_python.sh 3.13.2t # ------------------------------------------------------------------------------ FROM builder-py-base AS builder-py-3_14 -RUN /build_python.sh 3.14.0b2 +RUN /build_python.sh 3.14.0rc1 # ------------------------------------------------------------------------------ FROM python:3.13-slim-bookworm AS base -- cgit v1.2.3 From 35943c087613198aac358e011732c351ad1385e6 Mon Sep 17 00:00:00 2001 From: Chris Lovering Date: Wed, 30 Jul 2025 10:40:29 +0100 Subject: Add comment to explain why 3.13t can't be bumped yet --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index c08eb4b..dd7130a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,6 +38,7 @@ FROM builder-py-base AS builder-py-3_13 RUN /build_python.sh 3.13.5 # ------------------------------------------------------------------------------ FROM builder-py-base AS builder-py-3_13t +# This can't be bumped to latest until https://github.com/python/cpython/issues/135734 is resolved. RUN /build_python.sh 3.13.2t # ------------------------------------------------------------------------------ FROM builder-py-base AS builder-py-3_14 -- cgit v1.2.3 From d0a5dd3a1f35d11d9c81370afe523dfe39c0d71f Mon Sep 17 00:00:00 2001 From: Chris Lovering Date: Wed, 30 Jul 2025 10:48:25 +0100 Subject: Close & unlick SharedMemory object in tests Not doing so outputs a warning about leaking SharedMemory, which fails the test --- tests/test_nsjail.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_nsjail.py b/tests/test_nsjail.py index 6764f1e..01be592 100644 --- a/tests/test_nsjail.py +++ b/tests/test_nsjail.py @@ -458,6 +458,8 @@ class NsJailTests(unittest.TestCase): shm = SharedMemory(create=True, size={shm_size}) shm.buf[:{buffer_size}] = bytearray([1] * {buffer_size}) + shm.close() + shm.unlink() """ ).strip() -- cgit v1.2.3 From 10a80ee92338958ff759c231ace94d2d68122621 Mon Sep 17 00:00:00 2001 From: Chris Lovering Date: Wed, 30 Jul 2025 10:55:50 +0100 Subject: Update eval deps to latest versions --- requirements/eval-deps.pip | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/eval-deps.pip b/requirements/eval-deps.pip index 40a1f6b..54a48c9 100644 --- a/requirements/eval-deps.pip +++ b/requirements/eval-deps.pip @@ -14,14 +14,14 @@ lark~=1.2 matplotlib~=3.10; python_version == "3.13" more-itertools~=10.7 networkx~=3.5 -numpy~=2.2; python_version == "3.13" -pandas~=2.2; python_version == "3.13" +numpy~=2.3; python_version == "3.13" +pandas~=2.3; python_version == "3.13" pendulum~=3.1 -pyarrow~=20.0; python_version == "3.13" +pyarrow~=21.0; python_version == "3.13" python-dateutil~=2.9 pyyaml~=6.0 -scipy~=1.15; python_version == "3.13" +scipy~=1.16; python_version == "3.13" sympy~=1.14 -typing-extensions~=4.13 +typing-extensions~=4.14 tzdata~=2025.2 yarl~=1.20 -- cgit v1.2.3 From af61bbdf7beb79d9fd98cbc6ea1055233bc5d936 Mon Sep 17 00:00:00 2001 From: Chris Lovering Date: Wed, 30 Jul 2025 11:02:22 +0100 Subject: Enable numpy and scipy in 3.14 now they have wheels --- requirements/eval-deps.pip | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/eval-deps.pip b/requirements/eval-deps.pip index 54a48c9..9af4f79 100644 --- a/requirements/eval-deps.pip +++ b/requirements/eval-deps.pip @@ -14,13 +14,13 @@ lark~=1.2 matplotlib~=3.10; python_version == "3.13" more-itertools~=10.7 networkx~=3.5 -numpy~=2.3; python_version == "3.13" +numpy~=2.3 pandas~=2.3; python_version == "3.13" pendulum~=3.1 pyarrow~=21.0; python_version == "3.13" python-dateutil~=2.9 pyyaml~=6.0 -scipy~=1.16; python_version == "3.13" +scipy~=1.16 sympy~=1.14 typing-extensions~=4.14 tzdata~=2025.2 -- cgit v1.2.3 From 006b79f8074dd744cbc1bb8f9585b65e09cd9ef4 Mon Sep 17 00:00:00 2001 From: Chris Lovering Date: Wed, 30 Jul 2025 13:12:51 +0100 Subject: Install fishhook now that it supports 3.13 --- requirements/eval-deps.pip | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/eval-deps.pip b/requirements/eval-deps.pip index 9af4f79..381ce0c 100644 --- a/requirements/eval-deps.pip +++ b/requirements/eval-deps.pip @@ -3,10 +3,10 @@ arrow~=1.3 attrs~=25.3 beautifulsoup4~=4.13 -# These packages don't support 3.13, 3.13t, nor 3.14-dev, so are commented out for now. +# Doesn't support 3.13, 3.13t, nor 3.14-dev, so commented out for now. # einspect~=0.5 -# fishhook~=0.3 +fishhook~=0.3; python_version == "3.13" forbiddenfruit~=0.1 fuzzywuzzy~=0.18 kaleido~=0.2 -- cgit v1.2.3