Skip to content

Commit 17d5643

Browse files
committed
Merge #695: build: Use more recent Python 3.9 for *nix builds
e267f9a build: Bump *nix release build environment to more recent 3.9 (Andrew Chow) dd6a594 build: Allow building binaries on any python 3.9 (Andrew Chow) e9b3191 pyenv: Set python version to just 3.9 (Andrew Chow) Pull request description: MacOS on Apple Silicon requires a more recent python version, so just bump it to the latest security release of 3.9, and let any 3.9 version when developing in pyenv. Top commit has no ACKs. Tree-SHA512: 0552bba9e648225e7cb6c2ba82309c5983d7444fd2a00200ee412d415a9ffbae6aea6ae197c1ac54486c86fcdc5d3e30aae0e0fd0d2bc65a2db9eb62b8e2f6f5
2 parents 675e346 + e267f9a commit 17d5643

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.9.7
1+
3.9

contrib/build.Dockerfile

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

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

contrib/build_bin.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ else
1919
fi
2020

2121
# We also need to change the timestamps of all of the base library files
22-
lib_dir=`pyenv root`/versions/3.9.7/lib/python3.9
22+
lib_dir=$(pyenv prefix)/lib/python3.9
2323
TZ=UTC find ${lib_dir} -name '*.py' -type f -execdir touch -t "201901010000.00" '{}' \;
2424

2525
# Make the standalone binary

docs/development/release-process.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ Note that the macOS build is non-deterministic.
3030

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

33-
Then a deterministic build of Python 3.9.7 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::
33+
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::
3434

35-
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.7
35+
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
3636

37-
Make sure that python 3.9.7 is active::
37+
Make sure that python 3.9.17 is active::
3838

3939
$ python --version
40-
Python 3.9.7
40+
Python 3.9.17
4141

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

0 commit comments

Comments
 (0)