feat: add python 3.10.0 to the samples image (GoogleCloudPlatform#6813)

parthea · web-flow · commit 84d7cb58a5b0 · 2021-10-08T07:15:41.000-04:00
* feat: add python 3.10.0 to the samples image

* update to the latest version of Cloud SDK

* use keyserver keyserver.ubuntu.com

* fix: bump minimum version of Flask-OpenID from 1.2.5 to 1.3.0
diff --git a/.kokoro/docker/Dockerfile b/.kokoro/docker/Dockerfile
@@ -117,7 +117,7 @@ RUN set -ex \
     && export GNUPGHOME="$(mktemp -d)" \
     && echo "disable-ipv6" >> "${GNUPGHOME}/dirmngr.conf" \
     && /tmp/fetch_gpg_keys.sh \
-    && for PYTHON_VERSION in 2.7.18 3.6.13 3.7.10 3.8.8 3.9.2; do \
+    && for PYTHON_VERSION in 2.7.18 3.6.15 3.7.12 3.8.12 3.9.7 3.10.0; do \
         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" \
         && 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" \
         && gpg --batch --verify python-${PYTHON_VERSION}.tar.xz.asc python-${PYTHON_VERSION}.tar.xz \
@@ -165,7 +165,7 @@ RUN rm /tmp/get-pip.py
 RUN pip install --no-cache-dir virtualenv
 
 # Setup Cloud SDK
-ENV CLOUD_SDK_VERSION 339.0.0
+ENV CLOUD_SDK_VERSION 360.0.0
 # Use system python for cloud sdk.
 ENV CLOUDSDK_PYTHON python3.6
 RUN wget https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-$CLOUD_SDK_VERSION-linux-x86_64.tar.gz
diff --git a/.kokoro/docker/fetch_gpg_keys.sh b/.kokoro/docker/fetch_gpg_keys.sh
@@ -33,21 +33,21 @@ function retry {
 }
 
 # 2.7.17 (Benjamin Peterson)
-retry 3 gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \
+retry 3 gpg --keyserver keyserver.ubuntu.com --recv-keys \
       C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
 
 # 3.4.10, 3.5.9 (Larry Hastings)
-retry 3 gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \
+retry 3 gpg --keyserver keyserver.ubuntu.com --recv-keys \
       97FC712E4C024BBEA48A61ED3A5CA953F73C700D
 
 # 3.6.9, 3.7.5 (Ned Deily)
-retry 3 gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \
+retry 3 gpg --keyserver keyserver.ubuntu.com --recv-keys \
       0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
 
 # 3.8.0, 3.9.0 (Łukasz Langa)
-retry 3 gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \
+retry 3 gpg --keyserver keyserver.ubuntu.com --recv-keys \
       E3FF2839C048B25C084DEBE9B26995E310250568
 
 # 3.10.x and 3.11.x (Pablo Galindo Salgado)
-retry 3 gpg --keyserver ha.pool.sks-keyservers.net --recv-keys \
+retry 3 gpg --keyserver keyserver.ubuntu.com --recv-keys \
       A035C8C19219BA821ECEA86B64E628F8D684696D
diff --git a/composer/blog/gcp-tech-blog/data-orchestration-with-composer/constraints.txt b/composer/blog/gcp-tech-blog/data-orchestration-with-composer/constraints.txt
@@ -9,7 +9,7 @@ Flask-Caching==1.10.1
 Flask-JWT-Extended==3.25.1
 Flask-Login==0.5.0
 Flask-OAuthlib==0.9.6
-Flask-OpenID==1.2.5
+Flask-OpenID==1.3.0
 Flask-SQLAlchemy==2.5.1
 Flask-WTF==0.15.1
 Flask==1.1.2
diff --git a/composer/workflows/constraints.txt b/composer/workflows/constraints.txt
@@ -10,7 +10,7 @@ Flask-Caching==1.10.1
 Flask-JWT-Extended==3.25.1
 Flask-Login==0.4.1
 Flask-OAuthlib==0.9.5
-Flask-OpenID==1.2.5
+Flask-OpenID==1.3.0
 Flask-SQLAlchemy==2.5.1
 Flask-WTF==0.14.3
 Flask==1.1.4
