Merge branch 'master' into master

Author: mankins

appengine/flexible/cloudsql/requirements.txt

@@ -1,4 +1,4 @@
 Flask==1.1.2
 Flask-SQLAlchemy==2.4.4
 gunicorn==20.0.4
-PyMySQL==0.10.1
+PyMySQL==1.0.0

appengine/standard/django/requirements.txt

@@ -1,2 +1,2 @@
-PyMySQL==0.10.1
+PyMySQL==0.10.1; python_version < '3.0'  # needs to stay under 1.0.0 for Python 2 support
 Django==1.11.29; python_version < '3.0'  # needs to stay under 2.0.0 for Python 2 support

appengine/standard/firebase/firenotes/backend/requirements.txt

@@ -1,6 +1,6 @@
 Flask==1.1.2
 pyjwt==1.7.1; python_version < '3.0'
-flask-cors==3.0.9
+flask-cors==3.0.10
 google-auth==1.24.0
 requests==2.25.1
 requests-toolbelt==0.9.1

appengine/standard_python3/cloudsql/requirements.txt

@@ -1,5 +1,5 @@
 flask==1.1.2
 # psycopg2==2.8.4
 psycopg2-binary==2.8.6 # you will need either the binary or the regular - for more info see http://initd.org/psycopg/docs/install.html
-PyMySQL==0.10.1
+PyMySQL==1.0.0
 SQLAlchemy==1.3.22

appengine/standard_python3/django/requirements.txt

@@ -1,2 +1,2 @@
 Django==3.1.5
-PyMySQL==0.10.1
+PyMySQL==1.0.0

cloud-sql/mysql/sqlalchemy/requirements.txt

@@ -1,4 +1,4 @@
 Flask==1.1.2
 SQLAlchemy==1.3.22
-PyMySQL==0.10.1
+PyMySQL==1.0.0
 gunicorn==20.0.4

endpoints/getting-started/requirements.txt

@@ -1,5 +1,5 @@
 Flask==1.1.2
-flask-cors==3.0.9
+flask-cors==3.0.10
 gunicorn==20.0.4
 six==1.15.0
 pyyaml==5.3.1

run/deployment-previews/Dockerfile

@@ -27,5 +27,5 @@ RUN pip3 install --upgrade pip
 RUN pip3 install -r requirements.txt
 
 # Run the CLI
-ENTRYPOINT ["python3","/app/check_status.py"]
+ENTRYPOINT ["python3", "/app/check_status.py"]
 # [END cloudrun_deployment_preview_dockerfile]

run/deployment-previews/check_status.py

@@ -128,7 +128,7 @@ def github_token(project_id: str, ghtoken_secretname: str) -> str:
         error(e, context=f"finding secret {ghtoken_secretname}")
 
     # The secret was encoded for you as part of the secret creation, so decode it now.
-    github_token = response.payload.data.decode("UTF-8")
+    github_token = response.payload.data.decode("UTF-8").strip()
     return github_token
 
 
@@ -245,7 +245,7 @@ def set(
         click.secho("Dry-run: ", fg="blue", bold=True, nl=False)
         click.echo(
             (
-                f"Status would have been created on {repo.repo_name}, "
+                f"Status would have been created on {repo_name}, "
                 f"commit {commit.sha[:7]}, linking to {revision_url} "
                 f"on service {service_obj['metadata']['name']}"
             )
@@ -260,7 +260,7 @@ def set(
         )
         click.secho("Success: ", fg="green", bold=True, nl=False)
         click.echo(
-            f"Status created on {repo.repo_name}, commit {commit.sha[:7]}, "
+            f"Status created on {repo_name}, commit {commit.sha[:7]}, "
             f"linking to {revision_url} on service {service_obj['metadata']['name']}"
         )
 

storage/s3-sdk/requirements.txt

@@ -1 +1 @@
-boto3==1.16.49
+boto3==1.16.51