Skip to content

Commit fe15ab4

Browse files
build(python): remove python 3.7 from kokoro Dockerfile (#689)
Source-Link: googleapis/synthtool@e44dc0c Post-Processor: gcr.io/repo-automation-bots/owlbot-python:latest@sha256:5ff7446edeaede81c3ed58b23a4e76a5403fba1350ce28478045657303b6479d
1 parent 2753ee8 commit fe15ab4

File tree

3 files changed

+3
-79
lines changed

3 files changed

+3
-79
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
docker:
22
image: gcr.io/repo-automation-bots/owlbot-python:latest
3-
digest: sha256:e1793a23ae0ee9aafb2e3a53b564a351f74790dbe3c2d75f8fc3b8c43e5c036c
3+
digest: sha256:5ff7446edeaede81c3ed58b23a4e76a5403fba1350ce28478045657303b6479d

packages/google-cloud-ndb/.kokoro/docker/docs/Dockerfile

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ RUN apt-get update \
4444
libsqlite3-dev \
4545
memcached \
4646
portaudio19-dev \
47+
python3-distutils \
4748
redis-server \
4849
software-properties-common \
4950
ssh \
@@ -63,40 +64,8 @@ RUN apt-get update \
6364
&& rm -rf /var/lib/apt/lists/* \
6465
&& rm -f /var/cache/apt/archives/*.deb
6566

66-
67-
COPY fetch_gpg_keys.sh /tmp
68-
# Install the desired versions of Python.
69-
RUN set -ex \
70-
&& export GNUPGHOME="$(mktemp -d)" \
71-
&& echo "disable-ipv6" >> "${GNUPGHOME}/dirmngr.conf" \
72-
&& /tmp/fetch_gpg_keys.sh \
73-
&& for PYTHON_VERSION in 3.7.8 3.8.5; do \
74-
wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
75-
&& wget --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
76-
&& gpg --batch --verify python-${PYTHON_VERSION}.tar.xz.asc python-${PYTHON_VERSION}.tar.xz \
77-
&& rm -r python-${PYTHON_VERSION}.tar.xz.asc \
78-
&& mkdir -p /usr/src/python-${PYTHON_VERSION} \
79-
&& tar -xJC /usr/src/python-${PYTHON_VERSION} --strip-components=1 -f python-${PYTHON_VERSION}.tar.xz \
80-
&& rm python-${PYTHON_VERSION}.tar.xz \
81-
&& cd /usr/src/python-${PYTHON_VERSION} \
82-
&& ./configure \
83-
--enable-shared \
84-
# This works only on Python 2.7 and throws a warning on every other
85-
# version, but seems otherwise harmless.
86-
--enable-unicode=ucs4 \
87-
--with-system-ffi \
88-
--without-ensurepip \
89-
&& make -j$(nproc) \
90-
&& make install \
91-
&& ldconfig \
92-
; done \
93-
&& rm -rf "${GNUPGHOME}" \
94-
&& rm -rf /usr/src/python* \
95-
&& rm -rf ~/.cache/
96-
9767
RUN wget -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' \
98-
&& python3.7 /tmp/get-pip.py \
9968
&& python3.8 /tmp/get-pip.py \
10069
&& rm /tmp/get-pip.py
10170

102-
CMD ["python3.7"]
71+
CMD ["python3.8"]

packages/google-cloud-ndb/.kokoro/docker/docs/fetch_gpg_keys.sh

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)