Fix all_the_cpythons. Add 3.5 to defaults

pull/22561/head
Richard Belleville 5 years ago
parent 0ec32634fb
commit 23c32621d6
  1. 6
      templates/tools/dockerfile/test/python_stretch_default_x64/Dockerfile.template
  2. 2
      third_party/abseil-cpp
  3. 23
      tools/dockerfile/test/python_stretch_default_x64/Dockerfile
  4. 1
      tools/run_tests/run_tests.py

@ -16,7 +16,11 @@
<%include file="../../python_stretch.include"/>
<%include file="../../compile_python_36.include"/>
<%include file="../../compile_python_38.include"/>
RUN apt-get update && apt-get install -y python3.5 python3.5-dev
RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5
RUN apt-get update && apt-get -t buster install -y python3.7 python3-all-dev
RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7

@ -1 +1 @@
Subproject commit df3ea785d8c30a9503321a3d35ee7d35808f190d
Subproject commit b832dce8489ef7b6231384909fd9b68d5a5ff2b7

@ -84,6 +84,29 @@ RUN cd /tmp && \
RUN python3.6 -m ensurepip && \
python3.6 -m pip install coverage
#=================
# Compile CPython 3.8.0b4 from source
RUN apt-get update && apt-get install -y zlib1g-dev libssl-dev
RUN apt-get update && apt-get install -y jq build-essential libffi-dev
RUN cd /tmp && \
wget -q https://www.python.org/ftp/python/3.8.0/Python-3.8.0b4.tgz && \
tar xzvf Python-3.8.0b4.tgz && \
cd Python-3.8.0b4 && \
./configure && \
make install
RUN cd /tmp && \
echo "b8f4f897df967014ddb42033b90c3058 Python-3.8.0b4.tgz" > checksum.md5 && \
md5sum -c checksum.md5
RUN python3.8 -m ensurepip && \
python3.8 -m pip install coverage
RUN apt-get update && apt-get install -y python3.5 python3.5-dev
RUN curl https://bootstrap.pypa.io/get-pip.py | python3.5
RUN apt-get update && apt-get -t buster install -y python3.7 python3-all-dev
RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7

@ -869,6 +869,7 @@ class PythonLanguage(object):
else:
return (
python27_config,
python35_config,
python36_config,
python37_config,
)

Loading…
Cancel
Save