Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add python 3.10.0 to the samples image #6813

Merged
merged 5 commits into from
Oct 8, 2021
+9 −9
Merged

feat: add python 3.10.0 to the samples image #6813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3076d4e
feat: add python 3.10.0 to the samples image
parthea Oct 7, 2021
1dbd262
update to the latest version of Cloud SDK
parthea Oct 7, 2021
246d6b6
use keyserver keyserver.ubuntu.com
parthea Oct 7, 2021
e9aa298
Merge branch 'master' into parthea-patch-1
parthea Oct 7, 2021
f2af3b3
fix: bump minimum version of Flask-OpenID from 1.2.5 to 1.3.0
parthea Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .kokoro/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .kokoro/docker/fetch_gpg_keys.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
parthea marked this conversation as resolved.
Show resolved Hide resolved
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
2 changes: 1 addition & 1 deletion composer/blog/gcp-tech-blog/data-orchestration-with-composer/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion composer/workflows/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down