Skip to content

Commit

Permalink
Merge #759: build: Use Python 3.9.19
Browse files Browse the repository at this point in the history
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
  • Loading branch information
achow101 committed Sep 12, 2024
2 parents e10da04 + c19090e commit 32b50a5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion contrib/build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/build_wine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

set -ex

PYTHON_VERSION=3.9.7
PYTHON_VERSION=3.9.19

PYTHON_FOLDER="python3"
PYHOME="c:/$PYTHON_FOLDER"
Expand Down
10 changes: 4 additions & 6 deletions docs/development/release-process.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,21 @@ 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
=====================

Note that the macOS build is non-deterministic.

First install `pyenv <https://github.com/pyenv/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 <https://github.com/sdispater/poetry>`_ with ``pip install poetry``

Expand Down

0 comments on commit 32b50a5

Please sign in to comment.