Skip to content

Commit 74551ae

Browse files
authored
feat(python): add python 3.10.0 (#172)
* feat(python): add 3.10.0 * use latest version of Cloud SDK * use the latest version of nox🎃
1 parent f1383ee commit 74551ae

3 files changed

Lines changed: 16 additions & 19 deletions

File tree

python/cloud-devrel-kokoro-resources/python-base/Dockerfile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,12 @@ ENV GNUPGHOME /tmp/gpg
6666
# https://github.com/docker-library/faq#openpgp--gnupg-keys-and-verification
6767
# See https://www.python.org/downloads/ 'OpenPGP Public Keys' for new keys.
6868
RUN set -ex \
69-
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \
70-
# 2.7.17 (Benjamin Peterson)
69+
&& gpg --keyserver keyserver.ubuntu.com --recv-keys \
70+
# 2.7.18 (Benjamin Peterson)
7171
C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF \
72-
# 3.4.10, 3.5.10 (Larry Hastings)
73-
97FC712E4C024BBEA48A61ED3A5CA953F73C700D \
74-
# 3.6.12, 3.7.9 (Ned Deily)
72+
# 3.6.15, 3.7.12 (Ned Deily)
7573
0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D \
76-
# 3.8.6 and 3.9.0 (Łukasz Langa)
74+
# 3.8.12 and 3.9.7 (Łukasz Langa)
7775
E3FF2839C048B25C084DEBE9B26995E310250568 \
7876
# 3.10.x and 3.11.x (Pablo Galindo Salgado)
7977
A035C8C19219BA821ECEA86B64E628F8D684696D
@@ -95,7 +93,7 @@ RUN apt-get update \
9593
&& rm -f /var/cache/apt/archives/*.deb
9694

9795
# Install the desired versions of Python.
98-
RUN for PYTHON_VERSION in 2.7.17 3.6.12; do \
96+
RUN for PYTHON_VERSION in 2.7.18 3.6.15; do \
9997
set -ex \
10098
&& wget --quiet --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
10199
&& wget --quiet --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" \

python/cloud-devrel-kokoro-resources/python/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,16 @@ RUN apt update \
3131
libxslt1-dev \
3232
openssl \
3333
portaudio19-dev \
34-
python-pyaudio \
3534
zlib1g-dev \
3635
&& apt clean
3736

3837
RUN python --version
3938
RUN which python
4039

4140
# Setup Cloud SDK
42-
ENV CLOUD_SDK_VERSION 318.0.0
41+
ENV CLOUD_SDK_VERSION 360.0.0
4342
# Use system python for cloud sdk.
44-
ENV CLOUDSDK_PYTHON /usr/bin/python
43+
ENV CLOUDSDK_PYTHON python3.6
4544
RUN wget https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-$CLOUD_SDK_VERSION-linux-x86_64.tar.gz
4645
RUN tar xzf google-cloud-sdk-$CLOUD_SDK_VERSION-linux-x86_64.tar.gz
4746
RUN /google-cloud-sdk/install.sh
@@ -51,6 +50,6 @@ ENV PATH /google-cloud-sdk/bin:$PATH
5150
ENV PATH ~/.local/bin:/root/.local/bin:$PATH
5251

5352
# Install the current version of nox.
54-
RUN python3 -m pip install --user --no-cache-dir nox==2020.8.22
53+
RUN python3 -m pip install --user --no-cache-dir nox==2021.10.1
5554

5655
CMD ["nox"]

python/googleapis/python-multi/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM ubuntu:18.04
15+
FROM ubuntu:20.04
1616

1717
ENV DEBIAN_FRONTEND noninteractive
1818

@@ -79,14 +79,14 @@ ENV GNUPGHOME /tmp/gpg
7979
# https://github.com/docker-library/faq#openpgp--gnupg-keys-and-verification
8080
# See https://www.python.org/downloads/ 'OpenPGP Public Keys' for new keys.
8181
RUN set -ex \
82-
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \
83-
# 2.7.17 (Benjamin Peterson)
82+
&& gpg --keyserver keyserver.ubuntu.com --recv-keys \
83+
# 2.7.18 (Benjamin Peterson)
8484
C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF \
8585
# 3.4.10, 3.5.10 (Larry Hastings)
8686
97FC712E4C024BBEA48A61ED3A5CA953F73C700D \
87-
# 3.6.12, 3.7.9 (Ned Deily)
87+
# 3.6.15, 3.7.12 (Ned Deily)
8888
0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D \
89-
# 3.8.6 and 3.9.0 (Łukasz Langa)
89+
# 3.8.12 and 3.9.7 (Łukasz Langa)
9090
E3FF2839C048B25C084DEBE9B26995E310250568 \
9191
# 3.10.x and 3.11.x (Pablo Galindo Salgado)
9292
A035C8C19219BA821ECEA86B64E628F8D684696D
@@ -109,7 +109,7 @@ RUN apt-get update \
109109

110110
# Install Microsoft ODBC 17 Driver and unixodbc for testing SQL Server samples
111111
RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
112-
&& curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt/sources.list.d/mssql-release.list \
112+
&& curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list > /etc/apt/sources.list.d/mssql-release.list \
113113
&& apt-get update \
114114
&& ACCEPT_EULA=Y apt-get install -y --no-install-recommends \
115115
msodbcsql17 \
@@ -120,7 +120,7 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
120120
&& rm -f /var/cache/apt/archives/*.deb
121121

122122
# Install the desired versions of Python.
123-
RUN for PYTHON_VERSION in 2.7.17 3.4.10 3.5.10 3.6.12 3.7.9 3.8.6 3.9.0; do \
123+
RUN for PYTHON_VERSION in 2.7.18 3.6.15 3.7.12 3.8.12 3.9.7 3.10.0; do \
124124
set -ex \
125125
&& wget --quiet --no-check-certificate -O python-${PYTHON_VERSION}.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
126126
&& wget --quiet --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" \
@@ -172,7 +172,7 @@ RUN rm /tmp/get-pip.py
172172
RUN pip install --no-cache-dir virtualenv
173173

174174
# Setup Cloud SDK
175-
ENV CLOUD_SDK_VERSION 318.0.0
175+
ENV CLOUD_SDK_VERSION 360.0.0
176176
# Use system python for cloud sdk.
177177
ENV CLOUDSDK_PYTHON python3.6
178178
RUN wget https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-$CLOUD_SDK_VERSION-linux-x86_64.tar.gz

0 commit comments

Comments
 (0)