Skip to content

Commit

Permalink
fix ubuntu20 for python39
Browse files Browse the repository at this point in the history
  • Loading branch information
culhatsker committed Nov 11, 2024
1 parent 38496a5 commit 9c1021e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
10 changes: 7 additions & 3 deletions templates/ubuntu20/common/base.dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
RUN apt-get update; \
apt-get install -y --no-install-recommends \
git \
python3-dev \
python3.9-dev \
python3-pip \
build-essential \
cmake \
Expand Down Expand Up @@ -192,12 +192,16 @@ ARG INSTALL_PACKAGES="-c=python -c=core"
{% elif 'dev' == distribution or 'dev_no_samples' == distribution %}
ARG LGPL_DEPS="g++ \
gcc \
libc6-dev"
libc6-dev \
python3.9-venv \
python3-pip"
ARG INSTALL_PACKAGES="-c=python -c=core -c=dev"
{% else %}
ARG LGPL_DEPS="g++ \
gcc \
libc6-dev"
libc6-dev \
python3.9-venv \
python3-pip"
ARG INSTALL_PACKAGES="-c=python"
{% endif %}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# setup Python
ENV PYTHON_VER python3.8
ENV PYTHON_VER python3.9

RUN ${PYTHON_VER} -m pip install --upgrade pip
2 changes: 1 addition & 1 deletion utils/arg_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ def parse_args(name: str, description: str): # noqa
if args.os in "ubuntu22":
args.python = "python310"
else:
args.python = "python38"
args.python = "python39"

if args.python == "python38" and "win" in args.os:
if not hasattr(args, "pre_stage_msbuild") or not args.pre_stage_msbuild:
Expand Down

0 comments on commit 9c1021e

Please sign in to comment.