Skip to content

Commit 32b50a5

Browse files
committed
Merge #759: build: Use Python 3.9.19
c19090e build: Use Python 3.9.19 (Ava Chow) Pull request description: 3.9.17 wasn't building in the linux arm64 container. ACKs for top commit: brunoerg: utACK c19090e Tree-SHA512: 923e90bcea28e7f56c5830e6ea513fc7dd9e245b53e751586c45207c39c54da07d0e4e253e26970c8b7eaf155a440b2257aa667efafb056885d018bf83470d1c
2 parents e10da04 + c19090e commit 32b50a5

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

contrib/build.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ COPY contrib/reproducible-python.diff /opt/reproducible-python.diff
3838
ENV PYTHON_CONFIGURE_OPTS="--enable-shared"
3939
ENV BUILD_DATE="Jan 1 2019"
4040
ENV BUILD_TIME="00:00:00"
41-
RUN eval "$(pyenv init --path)" && eval "$(pyenv virtualenv-init -)" && cat /opt/reproducible-python.diff | pyenv install -kp 3.9.17
41+
RUN eval "$(pyenv init --path)" && eval "$(pyenv virtualenv-init -)" && cat /opt/reproducible-python.diff | pyenv install -kp 3.9.19
4242

4343
ENV LC_ALL=C.UTF-8
4444
ENV LANG=C.UTF-8

contrib/build_wine.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
set -ex
55

6-
PYTHON_VERSION=3.9.7
6+
PYTHON_VERSION=3.9.19
77

88
PYTHON_FOLDER="python3"
99
PYHOME="c:/$PYTHON_FOLDER"

docs/development/release-process.rst

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,21 @@ Build everything::
2828
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"
2929
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"
3030

31-
i.e.
32-
3331
Building macOS binary
3432
=====================
3533

3634
Note that the macOS build is non-deterministic.
3735

3836
First install `pyenv <https://github.com/pyenv/pyenv>`_ using whichever method you prefer.
3937

40-
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::
38+
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::
4139

42-
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
40+
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
4341

44-
Make sure that python 3.9.17 is active::
42+
Make sure that python 3.9.19 is active::
4543

4644
$ python --version
47-
Python 3.9.17
45+
Python 3.9.19
4846

4947
Now install `Poetry <https://github.com/sdispater/poetry>`_ with ``pip install poetry``
5048

0 commit comments

Comments
 (0)