From 3745cd65579a62f8ffa2c8d248380023e608d606 Mon Sep 17 00:00:00 2001 From: Rongxin Liu Date: Sat, 21 Dec 2024 20:34:14 -0500 Subject: [PATCH 1/4] update Dockerfile to install Python 3.13.x --- Dockerfile | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 67455d7..f184def 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,19 +61,19 @@ RUN apt update && \ make tk-dev unzip wget xz-utils zlib1g-dev -# Install Python 3.12.x +# Install Python 3.13.x # https://www.python.org/downloads/ RUN cd /tmp && \ - curl --remote-name https://www.python.org/ftp/python/3.12.8/Python-3.12.8.tgz && \ - tar xzf Python-3.12.8.tgz && \ - rm --force Python-3.12.8.tgz && \ - cd Python-3.12.8 && \ + curl --remote-name https://www.python.org/ftp/python/3.13.1/Python-3.13.1.tgz && \ + tar xzf Python-3.13.1.tgz && \ + rm --force Python-3.13.1.tgz && \ + cd Python-3.13.1 && \ CFLAGS="-Os" ./configure --disable-static --enable-optimizations --enable-shared --with-lto --without-tests && \ ./configure && \ make && \ make install && \ cd .. && \ - rm --force --recursive Python-3.12.8 && \ + rm --force --recursive Python-3.13.1 && \ ln --relative --symbolic /usr/local/bin/pip3 /usr/local/bin/pip && \ ln --relative --symbolic /usr/local/bin/python3 /usr/local/bin/python && \ pip3 install --no-cache-dir --upgrade pip @@ -243,6 +243,17 @@ RUN apt update && \ groupadd docker +# Install Rust +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y +ENV PATH="/root/.cargo/bin:${PATH}" + + +# Temporarily install msgspec from GitHub until it's officially compatible with Python 3.13 +# https://github.com/jcrist/msgspec/issues/698 +# https://github.com/jcrist/msgspec/issues/777 +RUN pip install git+https://github.com/jcrist/msgspec.git@main + + # Install Python packages RUN pip3 install --no-cache-dir \ autopep8 \ From defb976035b8bd4d69855e703ae9d987782c92c2 Mon Sep 17 00:00:00 2001 From: Rongxin Liu Date: Sun, 18 May 2025 21:16:47 -0400 Subject: [PATCH 2/4] update Python installation to version 3.13.3 and remove temporary msgspec installation --- Dockerfile | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index ba38464..56a6c41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,16 +64,16 @@ RUN apt update && \ # Install Python 3.13.x # https://www.python.org/downloads/ RUN cd /tmp && \ - curl --remote-name https://www.python.org/ftp/python/3.13.1/Python-3.13.1.tgz && \ - tar xzf Python-3.13.1.tgz && \ - rm --force Python-3.13.1.tgz && \ - cd Python-3.13.1 && \ + curl --remote-name https://www.python.org/ftp/python/3.13.3/Python-3.13.3.tgz && \ + tar xzf Python-3.13.3.tgz && \ + rm --force Python-3.13.3.tgz && \ + cd Python-3.13.3 && \ CFLAGS="-Os" ./configure --disable-static --enable-optimizations --enable-shared --with-lto --without-tests && \ ./configure && \ make && \ make install && \ cd .. && \ - rm --force --recursive Python-3.13.1 && \ + rm --force --recursive Python-3.13.3 && \ ln --relative --symbolic /usr/local/bin/pip3 /usr/local/bin/pip && \ ln --relative --symbolic /usr/local/bin/python3 /usr/local/bin/python && \ pip3 install --no-cache-dir --upgrade pip @@ -248,12 +248,6 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y ENV PATH="/root/.cargo/bin:${PATH}" -# Temporarily install msgspec from GitHub until it's officially compatible with Python 3.13 -# https://github.com/jcrist/msgspec/issues/698 -# https://github.com/jcrist/msgspec/issues/777 -RUN pip install git+https://github.com/jcrist/msgspec.git@main - - # Install Python packages RUN apt install --yes cargo `# For jellyfish, via lib50` && \ pip3 install --no-cache-dir \ From 7e2bb558899e2c498402261c38934c144e17e113 Mon Sep 17 00:00:00 2001 From: Rongxin Liu Date: Sun, 18 May 2025 21:18:41 -0400 Subject: [PATCH 3/4] remove Rust installation from Dockerfile --- Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 56a6c41..e46a824 100644 --- a/Dockerfile +++ b/Dockerfile @@ -243,11 +243,6 @@ RUN apt update && \ groupadd docker -# Install Rust -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -ENV PATH="/root/.cargo/bin:${PATH}" - - # Install Python packages RUN apt install --yes cargo `# For jellyfish, via lib50` && \ pip3 install --no-cache-dir \ From c4966a1c8c5d5b471acf4bc09d5b89cba48a12d2 Mon Sep 17 00:00:00 2001 From: Rongxin Liu Date: Sun, 20 Jul 2025 16:20:26 -0400 Subject: [PATCH 4/4] update Python version to 3.13.5 --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index e46a824..585801a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,16 +64,16 @@ RUN apt update && \ # Install Python 3.13.x # https://www.python.org/downloads/ RUN cd /tmp && \ - curl --remote-name https://www.python.org/ftp/python/3.13.3/Python-3.13.3.tgz && \ - tar xzf Python-3.13.3.tgz && \ - rm --force Python-3.13.3.tgz && \ - cd Python-3.13.3 && \ + curl --remote-name https://www.python.org/ftp/python/3.13.5/Python-3.13.5.tgz && \ + tar xzf Python-3.13.5.tgz && \ + rm --force Python-3.13.5.tgz && \ + cd Python-3.13.5 && \ CFLAGS="-Os" ./configure --disable-static --enable-optimizations --enable-shared --with-lto --without-tests && \ ./configure && \ make && \ make install && \ cd .. && \ - rm --force --recursive Python-3.13.3 && \ + rm --force --recursive Python-3.13.5 && \ ln --relative --symbolic /usr/local/bin/pip3 /usr/local/bin/pip && \ ln --relative --symbolic /usr/local/bin/python3 /usr/local/bin/python && \ pip3 install --no-cache-dir --upgrade pip