App engine upversion (#2437)

* App engine upversion * Python 2 compatible pytest
GoogleCloudPlatform · Oct 8, 2019 · 2b2cef9 · 2b2cef9
1 parent 7073d87
commit 2b2cef9
Show file tree

Hide file tree

Showing 53 changed files with 121 additions and 124 deletions.
diff --git a/appengine/flexible/analytics/requirements.txt b/appengine/flexible/analytics/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.0.2
+Flask==1.1.1
 gunicorn==19.9.0
-requests[security]==2.21.0
+requests[security]==2.22.0
diff --git a/appengine/flexible/cloudsql/requirements.txt b/appengine/flexible/cloudsql/requirements.txt
@@ -1,4 +1,4 @@
-Flask==1.0.2
-Flask-SQLAlchemy==2.3.2
+Flask==1.1.1
+Flask-SQLAlchemy==2.4.1
 gunicorn==19.9.0
 PyMySQL==0.9.3
diff --git a/appengine/flexible/cloudsql_postgresql/requirements.txt b/appengine/flexible/cloudsql_postgresql/requirements.txt
@@ -1,4 +1,4 @@
-Flask==1.0.2
-Flask-SQLAlchemy==2.3.2
+Flask==1.1.1
+Flask-SQLAlchemy==2.4.1
 gunicorn==19.9.0
-psycopg2==2.7.7
+psycopg2==2.8.3
diff --git a/appengine/flexible/datastore/requirements.txt b/appengine/flexible/datastore/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.0.2
-google-cloud-datastore==1.7.3
+Flask==1.1.1
+google-cloud-datastore==1.9.0
 gunicorn==19.9.0
diff --git a/appengine/flexible/disk/requirements.txt b/appengine/flexible/disk/requirements.txt
@@ -1,2 +1,2 @@
-Flask==1.0.2
+Flask==1.1.1
 gunicorn==19.9.0
diff --git a/appengine/flexible/django_cloudsql/requirements.txt b/appengine/flexible/django_cloudsql/requirements.txt
@@ -1,5 +1,5 @@
-Django==2.1.10
+Django==2.2.5
 # mysqlclient==1.4.1  # Uncomment this line if using MySQL
-wheel==0.32.3
+wheel==0.33.6
 gunicorn==19.9.0
-psycopg2==2.7.7  # Comment this line out if using MySQL
+psycopg2==2.8.3
diff --git a/appengine/flexible/extending_runtime/requirements.txt b/appengine/flexible/extending_runtime/requirements.txt
@@ -1,2 +1,2 @@
-Flask==1.0.2
+Flask==1.1.1
 gunicorn==19.9.0
diff --git a/appengine/flexible/hello_world/requirements.txt b/appengine/flexible/hello_world/requirements.txt
@@ -1,2 +1,2 @@
-Flask==1.0.2
+Flask==1.1.1
 gunicorn==19.9.0
diff --git a/appengine/flexible/hello_world_django/requirements.txt b/appengine/flexible/hello_world_django/requirements.txt
@@ -1,2 +1,2 @@
-Django==2.1.10
+Django==2.2.5
 gunicorn==19.9.0
diff --git a/appengine/flexible/mailgun/requirements.txt b/appengine/flexible/mailgun/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.0.2
+Flask==1.1.1
 gunicorn==19.9.0
-requests[security]==2.21.0
+requests[security]==2.22.0
diff --git a/appengine/flexible/mailjet/requirements.txt b/appengine/flexible/mailjet/requirements.txt
@@ -1,4 +1,4 @@
-Flask==1.0.2
+Flask==1.1.1
 gunicorn==19.9.0
-requests[security]==2.21.0
-mailjet-rest==1.3.0
+requests[security]==2.22.0
+mailjet-rest==1.3.3
diff --git a/appengine/flexible/memcache/requirements.txt b/appengine/flexible/memcache/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.0.2
+Flask==1.1.1
 gunicorn==19.9.0
-pylibmc==1.6.0
+pylibmc==1.6.1
diff --git a/appengine/flexible/metadata/requirements.txt b/appengine/flexible/metadata/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.0.2
+Flask==1.1.1
 gunicorn==19.9.0
-requests[security]==2.21.0
+requests[security]==2.22.0
diff --git a/appengine/flexible/multiple_services/gateway-service/requirements.txt b/appengine/flexible/multiple_services/gateway-service/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.0.2
+Flask==1.1.1
 gunicorn==19.9.0
-requests==2.21.0
+requests==2.22.0
diff --git a/appengine/flexible/multiple_services/static-service/requirements.txt b/appengine/flexible/multiple_services/static-service/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.0.2
+Flask==1.1.1
 gunicorn==19.9.0
-requests==2.21.0
+requests==2.22.0
diff --git a/appengine/flexible/numpy/requirements.txt b/appengine/flexible/numpy/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.0.2
+Flask==1.1.1
 gunicorn==19.9.0
-numpy==1.16.1
+numpy==1.17.2
diff --git a/appengine/flexible/pubsub/requirements.txt b/appengine/flexible/pubsub/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.0.2
-google-cloud-pubsub==0.39.1
+Flask==1.1.1
+google-cloud-pubsub==1.0.0
 gunicorn==19.9.0
diff --git a/appengine/flexible/redis/requirements.txt b/appengine/flexible/redis/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.0.2
+Flask==1.1.1
 gunicorn==19.9.0
-redis==3.1.0
+redis==3.3.8
diff --git a/appengine/flexible/scipy/requirements.txt b/appengine/flexible/scipy/requirements.txt
@@ -1,5 +1,5 @@
-Flask==1.0.2
+Flask==1.1.1
 gunicorn==19.9.0
-numpy==1.16.1
+numpy==1.17.2
 scipy==1.2.0
-Pillow==5.4.1
+Pillow==6.1.0
diff --git a/appengine/flexible/sendgrid/main.py b/appengine/flexible/sendgrid/main.py
@@ -17,7 +17,7 @@
 
 from flask import Flask, render_template, request
 import sendgrid
-from sendgrid.helpers import mail
+from sendgrid.helpers.mail import Mail
 
 SENDGRID_API_KEY = os.environ['SENDGRID_API_KEY']
 SENDGRID_SENDER = os.environ['SENDGRID_SENDER']
@@ -33,20 +33,19 @@ def index():
 # [START gae_flex_sendgrid]
 @app.route('/send/email', methods=['POST'])
 def send_email():
-    to = request.form.get('to')
-    if not to:
+    recipient = request.form.get('to')
+    if not recipient:
         return ('Please provide an email address in the "to" query string '
                 'parameter.'), 400
 
-    sg = sendgrid.SendGridAPIClient(apikey=SENDGRID_API_KEY)
+    message = Mail(
+        from_email=SENDGRID_SENDER,
+        to_emails='{},'.format(recipient),
+        subject='This is a test email',
+        html_content='<strong>Example</strong> message.')
+    sg = sendgrid.SendGridAPIClient(SENDGRID_API_KEY)
 
-    to_email = mail.Email(to)
-    from_email = mail.Email(SENDGRID_SENDER)
-    subject = 'This is a test email'
-    content = mail.Content('text/plain', 'Example message.')
-    message = mail.Mail(from_email, subject, to_email, content)
-
-    response = sg.client.mail.send.post(request_body=message.get())
+    response = sg.send(message)
 
     if response.status_code != 202:
         return 'An error occurred: {}'.format(response.body), 500

diff --git a/appengine/flexible/sendgrid/requirements.txt b/appengine/flexible/sendgrid/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.0.2
-sendgrid==5.6.0
+Flask==1.1.1
+sendgrid==6.1.0
 gunicorn==19.9.0
diff --git a/appengine/flexible/static_files/requirements.txt b/appengine/flexible/static_files/requirements.txt
@@ -1,2 +1,2 @@
-Flask==1.0.2
+Flask==1.1.1
 gunicorn==19.9.0
diff --git a/appengine/flexible/storage/requirements.txt b/appengine/flexible/storage/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.0.2
-google-cloud-storage==1.13.2
+Flask==1.1.1
+google-cloud-storage==1.19.1
 gunicorn==19.9.0
diff --git a/appengine/flexible/tasks/requirements.txt b/appengine/flexible/tasks/requirements.txt
@@ -1,4 +1,4 @@
-Flask==1.0.2
+Flask==1.1.1
 gunicorn==19.9.0
-google-cloud-tasks==1.1.0
+google-cloud-tasks==1.2.1
 googleapis-common-protos==1.6.0
diff --git a/appengine/flexible/twilio/requirements.txt b/appengine/flexible/twilio/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.0.2
+Flask==1.1.1
 gunicorn==19.9.0
-twilio==6.24.0
+twilio==6.31.0
diff --git a/appengine/flexible/websockets/requirements.txt b/appengine/flexible/websockets/requirements.txt
@@ -1,4 +1,4 @@
-Flask==1.0.2
+Flask==1.1.1
 Flask-Sockets==0.2.1
 gunicorn==19.9.0
-requests==2.21.0
+requests==2.22.0
diff --git a/appengine/standard/analytics/requirements.txt b/appengine/standard/analytics/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.0.2
-requests==2.21.0
+Flask==1.1.1
+requests==2.22.0
 requests-toolbelt==0.9.1
diff --git a/appengine/standard/firebase/firenotes/backend/requirements.txt b/appengine/standard/firebase/firenotes/backend/requirements.txt
@@ -1,6 +1,6 @@
-Flask==0.12.4
+Flask==1.1.1
 pyjwt==1.7.1
-flask-cors==3.0.7
-google-auth==1.6.2
-requests==2.21.0
+flask-cors==3.0.8
+google-auth==1.6.3
+requests==2.22.0
 requests-toolbelt==0.9.1
diff --git a/appengine/standard/firebase/firetactoe/requirements.txt b/appengine/standard/firebase/firetactoe/requirements.txt
@@ -1,5 +1,5 @@
-flask==1.0.2
-requests==2.21.0
+flask==1.1.1
+requests==2.22.0
 requests_toolbelt==0.9.1
 oauth2client==4.1.3
 functools32==3.2.3.post2; python_version < "3"
diff --git a/appengine/standard/flask/tutorial/requirements.txt b/appengine/standard/flask/tutorial/requirements.txt
@@ -1,2 +1,2 @@
-Flask==0.12.4
-Werkzeug<0.13.0,>=0.12.0
+Flask==1.1.1
+Werkzeug==0.16.0
diff --git a/appengine/standard/iap/requirements.txt b/appengine/standard/iap/requirements.txt
@@ -1 +1 @@
-Flask==1.0.2
+Flask==1.1.1
diff --git a/appengine/standard/mailgun/requirements.txt b/appengine/standard/mailgun/requirements.txt
@@ -1 +1 @@
-httplib2==0.12.0
+httplib2==0.13.1
diff --git a/appengine/standard/mailjet/requirements.txt b/appengine/standard/mailjet/requirements.txt
@@ -1,4 +1,4 @@
-Flask==1.0.2
-requests==2.21.0
+Flask==1.1.1
+requests==2.22.0
 requests-toolbelt==0.9.1
-mailjet-rest==1.3.0
+mailjet-rest==1.3.3
diff --git a/appengine/standard/ndb/transactions/requirements.txt b/appengine/standard/ndb/transactions/requirements.txt
@@ -1 +1 @@
-Flask==1.0.2
+Flask==1.1.1
diff --git a/appengine/standard/pubsub/requirements.txt b/appengine/standard/pubsub/requirements.txt
@@ -1,2 +1,2 @@
-Flask==1.0.2
-google-api-python-client==1.7.8
+Flask==1.1.1
+google-api-python-client==1.7.11
diff --git a/appengine/standard/sendgrid/main.py b/appengine/standard/sendgrid/main.py
@@ -16,7 +16,7 @@
 
 # [START sendgrid-imp]
 import sendgrid
-from sendgrid.helpers import mail
+from sendgrid.helpers.mail import Mail
 # [END sendgrid-imp]
 import webapp2
 
@@ -29,16 +29,14 @@
 
 def send_simple_message(recipient):
     # [START sendgrid-send]
+    message = Mail(
+        from_email=SENDGRID_SENDER,
+        to_emails='{},'.format(recipient),
+        subject='This is a test email',
+        html_content='<strong>Example</strong> message.')
 
-    sg = sendgrid.SendGridAPIClient(apikey=SENDGRID_API_KEY)
-
-    to_email = mail.Email(recipient)
-    from_email = mail.Email(SENDGRID_SENDER)
-    subject = 'This is a test email'
-    content = mail.Content('text/plain', 'Example message.')
-    message = mail.Mail(from_email, subject, to_email, content)
-
-    response = sg.client.mail.send.post(request_body=message.get())
+    sg = sendgrid.SendGridAPIClient(SENDGRID_API_KEY)
+    response = sg.send(message)
 
     return response
     # [END sendgrid-send]

diff --git a/appengine/standard/sendgrid/requirements.txt b/appengine/standard/sendgrid/requirements.txt
@@ -1 +1 @@
-sendgrid==5.6.0
+sendgrid==6.1.0
diff --git a/appengine/standard/storage/api-client/requirements.txt b/appengine/standard/storage/api-client/requirements.txt
@@ -1,3 +1,3 @@
-google-api-python-client==1.7.8
-google-auth==1.6.2
+google-api-python-client==1.7.11
+google-auth==1.6.3
 google-auth-httplib2==0.0.3
diff --git a/appengine/standard/storage/appengine-client/main.py b/appengine/standard/storage/appengine-client/main.py
@@ -88,8 +88,8 @@ def create_file(self, filename):
             filename, 'w', content_type='text/plain', options={
                 'x-goog-meta-foo': 'foo', 'x-goog-meta-bar': 'bar'},
                 retry_params=write_retry_params) as cloudstorage_file:
-                    cloudstorage_file.write('abcde\n')
-                    cloudstorage_file.write('f'*1024*4 + '\n')
+            cloudstorage_file.write('abcde\n')
+            cloudstorage_file.write('f'*1024*4 + '\n')
         self.tmp_filenames_to_clean_up.append(filename)
 # [END write]
 

diff --git a/appengine/standard/urlfetch/requests/requirements.txt b/appengine/standard/urlfetch/requests/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.0.2
-requests==2.21.0
+Flask==1.1.1
+requests==2.22.0
 requests-toolbelt==0.9.1
diff --git a/appengine/standard_python37/bigquery/requirements.txt b/appengine/standard_python37/bigquery/requirements.txt
@@ -1,2 +1,2 @@
-google-cloud-bigquery==1.9.0
-Flask==1.0.2
+google-cloud-bigquery==1.20.0
+Flask==1.1.1
diff --git a/appengine/standard_python37/building-an-app/building-an-app-1/requirements.txt b/appengine/standard_python37/building-an-app/building-an-app-1/requirements.txt
@@ -1 +1 @@
-Flask==1.0.2
+Flask==1.1.1
diff --git a/appengine/standard_python37/building-an-app/building-an-app-2/requirements.txt b/appengine/standard_python37/building-an-app/building-an-app-2/requirements.txt
@@ -1,2 +1,2 @@
-Flask==1.0.2
-google-cloud-datastore==1.7.3
+Flask==1.1.1
+google-cloud-datastore==1.9.0
diff --git a/appengine/standard_python37/building-an-app/building-an-app-3/requirements.txt b/appengine/standard_python37/building-an-app/building-an-app-3/requirements.txt
@@ -1,4 +1,4 @@
-Flask==1.0.2
-google-cloud-datastore==1.7.3
-google-auth==1.6.2
-requests==2.21.0
+Flask==1.1.1
+google-cloud-datastore==1.9.0
+google-auth==1.6.3
+requests==2.22.0
diff --git a/appengine/standard_python37/building-an-app/building-an-app-4/requirements.txt b/appengine/standard_python37/building-an-app/building-an-app-4/requirements.txt
@@ -1,4 +1,4 @@
-Flask==1.0.2
-google-cloud-datastore==1.7.3
-google-auth==1.6.2
-requests==2.21.0
+Flask==1.1.1
+google-cloud-datastore==1.9.0
+google-auth==1.6.3
+requests==2.22.0
diff --git a/appengine/standard_python37/cloudsql/requirements.txt b/appengine/standard_python37/cloudsql/requirements.txt
@@ -1,5 +1,5 @@
-flask==1.0.2
-psycopg2==2.7.7
-psycopg2-binary==2.7.7
+flask==1.1.1
+psycopg2==2.8.3
+psycopg2-binary==2.8.3
 PyMySQL==0.9.3
-SQLAlchemy==1.2.17
+SQLAlchemy==1.3.8
diff --git a/appengine/standard_python37/custom-server/requirements.txt b/appengine/standard_python37/custom-server/requirements.txt
@@ -1,2 +1,2 @@
-uwsgi==2.0.17.1
-flask==1.0.2
+uwsgi==2.0.18
+flask==1.1.1
diff --git a/appengine/standard_python37/django/requirements.txt b/appengine/standard_python37/django/requirements.txt
@@ -1,2 +1,2 @@
-Django==2.1.11
+Django==2.2.5
 PyMySQL==0.9.3
diff --git a/appengine/standard_python37/hello_world/requirements.txt b/appengine/standard_python37/hello_world/requirements.txt
@@ -1 +1 @@
-Flask==1.0.2
+Flask==1.1.1
diff --git a/appengine/standard_python37/pubsub/requirements.txt b/appengine/standard_python37/pubsub/requirements.txt
@@ -1,4 +1,4 @@
-Flask==1.0.2
-google-api-python-client==1.7.8
+Flask==1.1.1
+google-api-python-client==1.7.11
 google-auth==1.6.3
-google-cloud-pubsub==0.40.0
+google-cloud-pubsub==1.0.0
diff --git a/appengine/standard_python37/redis/requirements.txt b/appengine/standard_python37/redis/requirements.txt
@@ -1,2 +1,2 @@
-Flask==1.0.2
-redis==3.2.1
+Flask==1.1.1
+redis==3.3.8
diff --git a/appengine/standard_python37/spanner/requirements.txt b/appengine/standard_python37/spanner/requirements.txt
@@ -1,2 +1,2 @@
-google-cloud-spanner==1.7.1
-Flask==1.0.2
+google-cloud-spanner==1.10.0
+Flask==1.1.1
diff --git a/appengine/standard_python37/warmup/requirements.txt b/appengine/standard_python37/warmup/requirements.txt
@@ -1 +1 @@
-flask==1.0.2
+flask==1.1.1