File tree Expand file tree Collapse file tree 6 files changed +12
-10
lines changed Expand file tree Collapse file tree 6 files changed +12
-10
lines changed Original file line number Diff line number Diff line change 1- 3.9
1+ 3.10.14
Original file line number Diff line number Diff line change @@ -38,7 +38,7 @@ COPY contrib/reproducible-python.diff /opt/reproducible-python.diff
3838ENV PYTHON_CONFIGURE_OPTS="--enable-shared"
3939ENV BUILD_DATE="Jan 1 2019"
4040ENV 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.19
41+ RUN eval "$(pyenv init --path)" && eval "$(pyenv virtualenv-init -)" && cat /opt/reproducible-python.diff | pyenv install -kp 3.10.14
4242
4343ENV LC_ALL=C.UTF-8
4444ENV LANG=C.UTF-8
Original file line number Diff line number Diff line change 2121fi
2222
2323# We also need to change the timestamps of all of the base library files
24- lib_dir=$( pyenv prefix) /lib/python3.9
24+ lib_dir=$( pyenv prefix) /lib/python3.10
2525TZ=UTC find ${lib_dir} -name ' *.py' -type f -execdir touch -t " 201901010000.00" ' {}' \;
2626
2727# Make the standalone binary
Original file line number Diff line number Diff line change 33
44set -ex
55
6- PYTHON_VERSION=3.9.13
6+ # There's no core.msi for 3.10.14 - 3.10.18
7+ PYTHON_VERSION=3.10.11
78
89PYTHON_FOLDER=" python3"
910PYHOME=" c:/$PYTHON_FOLDER "
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ Build everything::
2626
2727 docker run -it --name hwi-builder -v $PWD:/opt/hwi --rm --workdir /opt/hwi hwi-builder /bin/bash -c "contrib/build_bin.sh && contrib/build_dist.sh"
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"
29- 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"
29+ 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
3131Building macOS binary
3232=====================
@@ -35,14 +35,14 @@ Note that the macOS build is non-deterministic.
3535
3636First install `pyenv <https://github.com/pyenv/pyenv >`_ using whichever method you prefer.
3737
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::
38+ Then a deterministic build of Python 3.10.14 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::
3939
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
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.10.14
4141
42- Make sure that python 3.9.19 is active::
42+ Make sure that python 3.10.14 is active::
4343
4444 $ python --version
45- Python 3.9.19
45+ Python 3.10.14
4646
4747Now install `Poetry <https://github.com/sdispater/poetry >`_ with ``pip install poetry ``
4848
Original file line number Diff line number Diff line change @@ -23,7 +23,8 @@ pyaes = "^1.6"
2323mnemonic = " ~0"
2424typing-extensions = " ^4.4"
2525libusb1 = " >=1.7,<4"
26- pyside2 = { version = " ^5.14.0" , optional = true , python = " <3.10" }
26+ # Used only for Wine
27+ pyside2 = { version = " ^5.14.0" , optional = true , python = " 3.10" }
2728cbor2 = " ^5.4.6"
2829pyserial = " ^3.5"
2930dataclasses = {version = " ^0.8" , python = " >=3.6,<3.7" }
You can’t perform that action at this time.
0 commit comments