From c19090e38c12a6dd69ebe12ef6949fd9b3766ebf Mon Sep 17 00:00:00 2001 From: Ava Chow Date: Thu, 12 Sep 2024 11:36:11 -0400 Subject: [PATCH] build: Use Python 3.9.19 --- contrib/build.Dockerfile | 2 +- contrib/build_wine.sh | 2 +- docs/development/release-process.rst | 10 ++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/contrib/build.Dockerfile b/contrib/build.Dockerfile index c99ceaf44..a1edf1171 100644 --- a/contrib/build.Dockerfile +++ b/contrib/build.Dockerfile @@ -38,7 +38,7 @@ COPY contrib/reproducible-python.diff /opt/reproducible-python.diff ENV PYTHON_CONFIGURE_OPTS="--enable-shared" ENV BUILD_DATE="Jan 1 2019" ENV BUILD_TIME="00:00:00" -RUN eval "$(pyenv init --path)" && eval "$(pyenv virtualenv-init -)" && cat /opt/reproducible-python.diff | pyenv install -kp 3.9.17 +RUN eval "$(pyenv init --path)" && eval "$(pyenv virtualenv-init -)" && cat /opt/reproducible-python.diff | pyenv install -kp 3.9.19 ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 diff --git a/contrib/build_wine.sh b/contrib/build_wine.sh index e03c0259a..061f54983 100755 --- a/contrib/build_wine.sh +++ b/contrib/build_wine.sh @@ -3,7 +3,7 @@ set -ex -PYTHON_VERSION=3.9.7 +PYTHON_VERSION=3.9.19 PYTHON_FOLDER="python3" PYHOME="c:/$PYTHON_FOLDER" diff --git a/docs/development/release-process.rst b/docs/development/release-process.rst index 6a3c58d04..fb739ffdc 100644 --- a/docs/development/release-process.rst +++ b/docs/development/release-process.rst @@ -28,8 +28,6 @@ Build everything:: docker run -it --name hwi-wine-builder -v $PWD:/opt/hwi --rm --workdir /opt/hwi hwi-wine-builder /bin/bash -c "contrib/build_wine.sh" docker run --platform linux/arm64 -it --rm --name hwi-builder-arm64 -v $PWD:/opt/hwi --workdir /opt/hwi hwi-builder-arm64 /bin/bash -c "contrib/build_bin.sh --without-gui && contrib/build_dist.sh --without-gui" -i.e. - Building macOS binary ===================== @@ -37,14 +35,14 @@ Note that the macOS build is non-deterministic. First install `pyenv `_ using whichever method you prefer. -Then a deterministic build of Python 3.9.17 needs to be installed. This can be done with the patch in ``contrib/reproducible-python.diff``. First ``cd`` into HWI's source tree. Then use:: +Then a deterministic build of Python 3.9.19 needs to be installed. This can be done with the patch in ``contrib/reproducible-python.diff``. First ``cd`` into HWI's source tree. Then use:: - cat contrib/reproducible-python.diff | PYTHON_CONFIGURE_OPTS="--enable-framework" BUILD_DATE="Jan 1 2019" BUILD_TIME="00:00:00" pyenv install -kp 3.9.17 + cat contrib/reproducible-python.diff | PYTHON_CONFIGURE_OPTS="--enable-framework" BUILD_DATE="Jan 1 2019" BUILD_TIME="00:00:00" pyenv install -kp 3.9.19 -Make sure that python 3.9.17 is active:: +Make sure that python 3.9.19 is active:: $ python --version - Python 3.9.17 + Python 3.9.19 Now install `Poetry `_ with ``pip install poetry``