Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2b2cef9

Browse filesBrowse files
gguusscrwilcox
gguuss
authored and
crwilcox
committed
App engine upversion (GoogleCloudPlatform#2437)
* App engine upversion * Python 2 compatible pytest
1 parent 7073d87 commit 2b2cef9
Copy full SHA for 2b2cef9

File tree

Expand file treeCollapse file tree

53 files changed

+121
-124
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

53 files changed

+121
-124
lines changed

‎appengine/flexible/analytics/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0
3-
requests[security]==2.21.0
3+
requests[security]==2.22.0

‎appengine/flexible/cloudsql/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Flask==1.0.2
2-
Flask-SQLAlchemy==2.3.2
1+
Flask==1.1.1
2+
Flask-SQLAlchemy==2.4.1
33
gunicorn==19.9.0
44
PyMySQL==0.9.3

‎appengine/flexible/cloudsql_postgresql/requirements.txt

Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Flask==1.0.2
2-
Flask-SQLAlchemy==2.3.2
1+
Flask==1.1.1
2+
Flask-SQLAlchemy==2.4.1
33
gunicorn==19.9.0
4-
psycopg2==2.7.7
4+
psycopg2==2.8.3

‎appengine/flexible/datastore/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
2-
google-cloud-datastore==1.7.3
1+
Flask==1.1.1
2+
google-cloud-datastore==1.9.0
33
gunicorn==19.9.0

‎appengine/flexible/disk/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0

‎appengine/flexible/django_cloudsql/requirements.txt

Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Django==2.1.10
1+
Django==2.2.5
22
# mysqlclient==1.4.1 # Uncomment this line if using MySQL
3-
wheel==0.32.3
3+
wheel==0.33.6
44
gunicorn==19.9.0
5-
psycopg2==2.7.7 # Comment this line out if using MySQL
5+
psycopg2==2.8.3

‎appengine/flexible/extending_runtime/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0

‎appengine/flexible/hello_world/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0

‎appengine/flexible/hello_world_django/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Django==2.1.10
1+
Django==2.2.5
22
gunicorn==19.9.0

‎appengine/flexible/mailgun/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0
3-
requests[security]==2.21.0
3+
requests[security]==2.22.0

‎appengine/flexible/mailjet/requirements.txt

Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0
3-
requests[security]==2.21.0
4-
mailjet-rest==1.3.0
3+
requests[security]==2.22.0
4+
mailjet-rest==1.3.3

‎appengine/flexible/memcache/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0
3-
pylibmc==1.6.0
3+
pylibmc==1.6.1

‎appengine/flexible/metadata/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0
3-
requests[security]==2.21.0
3+
requests[security]==2.22.0

‎appengine/flexible/multiple_services/gateway-service/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0
3-
requests==2.21.0
3+
requests==2.22.0

‎appengine/flexible/multiple_services/static-service/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0
3-
requests==2.21.0
3+
requests==2.22.0

‎appengine/flexible/numpy/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0
3-
numpy==1.16.1
3+
numpy==1.17.2

‎appengine/flexible/pubsub/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
2-
google-cloud-pubsub==0.39.1
1+
Flask==1.1.1
2+
google-cloud-pubsub==1.0.0
33
gunicorn==19.9.0

‎appengine/flexible/redis/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0
3-
redis==3.1.0
3+
redis==3.3.8

‎appengine/flexible/scipy/requirements.txt

Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0
3-
numpy==1.16.1
3+
numpy==1.17.2
44
scipy==1.2.0
5-
Pillow==5.4.1
5+
Pillow==6.1.0

‎appengine/flexible/sendgrid/main.py

Copy file name to clipboardExpand all lines: appengine/flexible/sendgrid/main.py
+10-11Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from flask import Flask, render_template, request
1919
import sendgrid
20-
from sendgrid.helpers import mail
20+
from sendgrid.helpers.mail import Mail
2121

2222
SENDGRID_API_KEY = os.environ['SENDGRID_API_KEY']
2323
SENDGRID_SENDER = os.environ['SENDGRID_SENDER']
@@ -33,20 +33,19 @@ def index():
3333
# [START gae_flex_sendgrid]
3434
@app.route('/send/email', methods=['POST'])
3535
def send_email():
36-
to = request.form.get('to')
37-
if not to:
36+
recipient = request.form.get('to')
37+
if not recipient:
3838
return ('Please provide an email address in the "to" query string '
3939
'parameter.'), 400
4040

41-
sg = sendgrid.SendGridAPIClient(apikey=SENDGRID_API_KEY)
41+
message = Mail(
42+
from_email=SENDGRID_SENDER,
43+
to_emails='{},'.format(recipient),
44+
subject='This is a test email',
45+
html_content='<strong>Example</strong> message.')
46+
sg = sendgrid.SendGridAPIClient(SENDGRID_API_KEY)
4247

43-
to_email = mail.Email(to)
44-
from_email = mail.Email(SENDGRID_SENDER)
45-
subject = 'This is a test email'
46-
content = mail.Content('text/plain', 'Example message.')
47-
message = mail.Mail(from_email, subject, to_email, content)
48-
49-
response = sg.client.mail.send.post(request_body=message.get())
48+
response = sg.send(message)
5049

5150
if response.status_code != 202:
5251
return 'An error occurred: {}'.format(response.body), 500

‎appengine/flexible/sendgrid/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
2-
sendgrid==5.6.0
1+
Flask==1.1.1
2+
sendgrid==6.1.0
33
gunicorn==19.9.0

‎appengine/flexible/static_files/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0

‎appengine/flexible/storage/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
2-
google-cloud-storage==1.13.2
1+
Flask==1.1.1
2+
google-cloud-storage==1.19.1
33
gunicorn==19.9.0

‎appengine/flexible/tasks/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0
3-
google-cloud-tasks==1.1.0
3+
google-cloud-tasks==1.2.1
44
googleapis-common-protos==1.6.0

‎appengine/flexible/twilio/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
gunicorn==19.9.0
3-
twilio==6.24.0
3+
twilio==6.31.0

‎appengine/flexible/websockets/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Flask==1.0.2
1+
Flask==1.1.1
22
Flask-Sockets==0.2.1
33
gunicorn==19.9.0
4-
requests==2.21.0
4+
requests==2.22.0

‎appengine/standard/analytics/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
2-
requests==2.21.0
1+
Flask==1.1.1
2+
requests==2.22.0
33
requests-toolbelt==0.9.1

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

Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Flask==0.12.4
1+
Flask==1.1.1
22
pyjwt==1.7.1
3-
flask-cors==3.0.7
4-
google-auth==1.6.2
5-
requests==2.21.0
3+
flask-cors==3.0.8
4+
google-auth==1.6.3
5+
requests==2.22.0
66
requests-toolbelt==0.9.1

‎appengine/standard/firebase/firetactoe/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
flask==1.0.2
2-
requests==2.21.0
1+
flask==1.1.1
2+
requests==2.22.0
33
requests_toolbelt==0.9.1
44
oauth2client==4.1.3
55
functools32==3.2.3.post2; python_version < "3"

‎appengine/standard/flask/tutorial/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Flask==0.12.4
2-
Werkzeug<0.13.0,>=0.12.0
1+
Flask==1.1.1
2+
Werkzeug==0.16.0

‎appengine/standard/iap/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Flask==1.0.2
1+
Flask==1.1.1

‎appengine/standard/mailgun/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
httplib2==0.12.0
1+
httplib2==0.13.1

‎appengine/standard/mailjet/requirements.txt

Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Flask==1.0.2
2-
requests==2.21.0
1+
Flask==1.1.1
2+
requests==2.22.0
33
requests-toolbelt==0.9.1
4-
mailjet-rest==1.3.0
4+
mailjet-rest==1.3.3

‎appengine/standard/ndb/transactions/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Flask==1.0.2
1+
Flask==1.1.1

‎appengine/standard/pubsub/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Flask==1.0.2
2-
google-api-python-client==1.7.8
1+
Flask==1.1.1
2+
google-api-python-client==1.7.11

‎appengine/standard/sendgrid/main.py

Copy file name to clipboardExpand all lines: appengine/standard/sendgrid/main.py
+8-10Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# [START sendgrid-imp]
1818
import sendgrid
19-
from sendgrid.helpers import mail
19+
from sendgrid.helpers.mail import Mail
2020
# [END sendgrid-imp]
2121
import webapp2
2222

@@ -29,16 +29,14 @@
2929

3030
def send_simple_message(recipient):
3131
# [START sendgrid-send]
32+
message = Mail(
33+
from_email=SENDGRID_SENDER,
34+
to_emails='{},'.format(recipient),
35+
subject='This is a test email',
36+
html_content='<strong>Example</strong> message.')
3237

33-
sg = sendgrid.SendGridAPIClient(apikey=SENDGRID_API_KEY)
34-
35-
to_email = mail.Email(recipient)
36-
from_email = mail.Email(SENDGRID_SENDER)
37-
subject = 'This is a test email'
38-
content = mail.Content('text/plain', 'Example message.')
39-
message = mail.Mail(from_email, subject, to_email, content)
40-
41-
response = sg.client.mail.send.post(request_body=message.get())
38+
sg = sendgrid.SendGridAPIClient(SENDGRID_API_KEY)
39+
response = sg.send(message)
4240

4341
return response
4442
# [END sendgrid-send]

‎appengine/standard/sendgrid/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sendgrid==5.6.0
1+
sendgrid==6.1.0

‎appengine/standard/storage/api-client/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
google-api-python-client==1.7.8
2-
google-auth==1.6.2
1+
google-api-python-client==1.7.11
2+
google-auth==1.6.3
33
google-auth-httplib2==0.0.3

‎appengine/standard/storage/appengine-client/main.py

Copy file name to clipboardExpand all lines: appengine/standard/storage/appengine-client/main.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ def create_file(self, filename):
8888
filename, 'w', content_type='text/plain', options={
8989
'x-goog-meta-foo': 'foo', 'x-goog-meta-bar': 'bar'},
9090
retry_params=write_retry_params) as cloudstorage_file:
91-
cloudstorage_file.write('abcde\n')
92-
cloudstorage_file.write('f'*1024*4 + '\n')
91+
cloudstorage_file.write('abcde\n')
92+
cloudstorage_file.write('f'*1024*4 + '\n')
9393
self.tmp_filenames_to_clean_up.append(filename)
9494
# [END write]
9595

‎appengine/standard/urlfetch/requests/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==1.0.2
2-
requests==2.21.0
1+
Flask==1.1.1
2+
requests==2.22.0
33
requests-toolbelt==0.9.1

‎appengine/standard_python37/bigquery/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
google-cloud-bigquery==1.9.0
2-
Flask==1.0.2
1+
google-cloud-bigquery==1.20.0
2+
Flask==1.1.1

‎appengine/standard_python37/building-an-app/building-an-app-1/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Flask==1.0.2
1+
Flask==1.1.1

‎appengine/standard_python37/building-an-app/building-an-app-2/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Flask==1.0.2
2-
google-cloud-datastore==1.7.3
1+
Flask==1.1.1
2+
google-cloud-datastore==1.9.0

‎appengine/standard_python37/building-an-app/building-an-app-3/requirements.txt

Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Flask==1.0.2
2-
google-cloud-datastore==1.7.3
3-
google-auth==1.6.2
4-
requests==2.21.0
1+
Flask==1.1.1
2+
google-cloud-datastore==1.9.0
3+
google-auth==1.6.3
4+
requests==2.22.0

‎appengine/standard_python37/building-an-app/building-an-app-4/requirements.txt

Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Flask==1.0.2
2-
google-cloud-datastore==1.7.3
3-
google-auth==1.6.2
4-
requests==2.21.0
1+
Flask==1.1.1
2+
google-cloud-datastore==1.9.0
3+
google-auth==1.6.3
4+
requests==2.22.0

‎appengine/standard_python37/cloudsql/requirements.txt

Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
flask==1.0.2
2-
psycopg2==2.7.7
3-
psycopg2-binary==2.7.7
1+
flask==1.1.1
2+
psycopg2==2.8.3
3+
psycopg2-binary==2.8.3
44
PyMySQL==0.9.3
5-
SQLAlchemy==1.2.17
5+
SQLAlchemy==1.3.8

‎appengine/standard_python37/custom-server/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
uwsgi==2.0.17.1
2-
flask==1.0.2
1+
uwsgi==2.0.18
2+
flask==1.1.1

‎appengine/standard_python37/django/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Django==2.1.11
1+
Django==2.2.5
22
PyMySQL==0.9.3

‎appengine/standard_python37/hello_world/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Flask==1.0.2
1+
Flask==1.1.1

‎appengine/standard_python37/pubsub/requirements.txt

Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Flask==1.0.2
2-
google-api-python-client==1.7.8
1+
Flask==1.1.1
2+
google-api-python-client==1.7.11
33
google-auth==1.6.3
4-
google-cloud-pubsub==0.40.0
4+
google-cloud-pubsub==1.0.0

‎appengine/standard_python37/redis/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Flask==1.0.2
2-
redis==3.2.1
1+
Flask==1.1.1
2+
redis==3.3.8

‎appengine/standard_python37/spanner/requirements.txt

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
google-cloud-spanner==1.7.1
2-
Flask==1.0.2
1+
google-cloud-spanner==1.10.0
2+
Flask==1.1.1

‎appengine/standard_python37/warmup/requirements.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
flask==1.0.2
1+
flask==1.1.1

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.