Skip to content

Commit

Permalink
Merge #494: Bump Pyenv's Python to 3.9
Browse files Browse the repository at this point in the history
d1055df Bump PyEnv version to 3.9.7 (Sjors Provoost)

Pull request description:

  Since the release notes mention support for Python 3.9. Or do we also want to guarantee backwards compatibility?

  Using 3.9.1 for PyEnv (latest available on macOS) and 3.9.2 for the Windows installer.

ACKs for top commit:
  achow101:
    ACK d1055df

Tree-SHA512: 8913672fe2c5aefcd76558c5d574984612606f94c883078c0f19df4d952fd55f42d79ac6d4dbc6738d441fd9c2f93105ebbe89e76b079255eb99b9cee7c7946c
  • Loading branch information
achow101 committed Nov 19, 2021
2 parents 4edf4f6 + d1055df commit a109bcd
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.6.12
3.9.7
2 changes: 1 addition & 1 deletion contrib/build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,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.6.12
RUN eval "$(pyenv init --path)" && eval "$(pyenv virtualenv-init -)" && cat /opt/reproducible-python.diff | pyenv install -kp 3.9.7

RUN dpkg --add-architecture i386
RUN wget -nc https://dl.winehq.org/wine-builds/winehq.key
Expand Down
2 changes: 1 addition & 1 deletion contrib/build_bin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pip install poetry
poetry install -E qt

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

# Make the standalone binary
Expand Down
3 changes: 1 addition & 2 deletions contrib/build_wine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@

set -ex

# No Windows installer for 3.6.12
PYTHON_VERSION=3.6.8
PYTHON_VERSION=3.9.7

PYTHON_FOLDER="python3"
PYHOME="c:/$PYTHON_FOLDER"
Expand Down

0 comments on commit a109bcd

Please sign in to comment.