chore(deps): bump more flask to 3.0.0 (GoogleCloudPlatform#10726)

glasnt · web-flow · commit 693968a1c2e6 · 2023-10-10T08:14:00.000+11:00
* chore(deps): bump flask to 3.0.0

* revert idp-sql change (known failing test)

* chore(deps): update flask to 3.0.0

* revert known flaky sample

* revert functions samples (functions-framework pins flask)

* fix: adapt python versions to support multiple flask

* revert changes on unrelated failing test

* fix: pin flask to same version as werkzeug

* fix: flask pins
diff --git a/appengine/flexible/analytics/requirements.txt b/appengine/flexible/analytics/requirements.txt
@@ -1,5 +1,6 @@
-Flask==2.1.0; python_version > '3.6'
-Flask==2.0.3; python_version < '3.7'
+Flask==3.0.0; python_version > '3.6'
+Flask==2.3.3; python_version < '3.7'
+Werkzeug==3.0.0; python_version > '3.6'
+Werkzeug==2.3.7; python_version < '3.7'
 gunicorn==20.1.0
 requests[security]==2.31.0
-Werkzeug==2.3.7
diff --git a/appengine/flexible/hello_world/requirements.txt b/appengine/flexible/hello_world/requirements.txt
@@ -1,3 +1,3 @@
-Flask==2.1.1
+Flask==2.3.3
 gunicorn==20.1.0
 Werkzeug==2.3.7
diff --git a/appengine/flexible/twilio/requirements.txt b/appengine/flexible/twilio/requirements.txt
@@ -1,5 +1,6 @@
-Flask==2.1.0; python_version > '3.6'
-Flask==2.0.3; python_version < '3.7'
+Flask==3.0.0; python_version > '3.6'
+Flask==2.3.3; python_version < '3.7'
+Werkzeug==3.0.0; python_version > '3.6'
+Werkzeug==2.3.7; python_version < '3.7'
 gunicorn==20.1.0
 twilio==8.2.1
-Werkzeug==2.3.7
diff --git a/appengine/flexible_python37_and_earlier/analytics/requirements.txt b/appengine/flexible_python37_and_earlier/analytics/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.1.0; python_version > '3.6'
+Flask==3.0.0; python_version > '3.6'
 Flask==2.0.3; python_version < '3.7'
 gunicorn==20.1.0
 requests[security]==2.31.0
diff --git a/appengine/flexible_python37_and_earlier/datastore/requirements.txt b/appengine/flexible_python37_and_earlier/datastore/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.1.0; python_version > '3.6'
+Flask==3.0.0; python_version > '3.6'
 Flask==2.0.3; python_version < '3.7'
 google-cloud-datastore==2.15.2
 gunicorn==20.1.0
diff --git a/appengine/flexible_python37_and_earlier/disk/requirements.txt b/appengine/flexible_python37_and_earlier/disk/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.1.0; python_version > '3.6'
+Flask==3.0.0; python_version > '3.6'
 Flask==2.0.3; python_version < '3.7'
 gunicorn==20.1.0
 Werkzeug==2.3.7
diff --git a/appengine/flexible_python37_and_earlier/extending_runtime/requirements.txt b/appengine/flexible_python37_and_earlier/extending_runtime/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.1.0; python_version > '3.6'
+Flask==3.0.0; python_version > '3.6'
 Flask==2.0.3; python_version < '3.7'
 gunicorn==20.1.0
 Werkzeug==2.3.7
diff --git a/appengine/flexible_python37_and_earlier/hello_world/requirements.txt b/appengine/flexible_python37_and_earlier/hello_world/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.1.0; python_version > '3.6'
+Flask==3.0.0; python_version > '3.6'
 Flask==2.0.3; python_version < '3.7'
 gunicorn==20.1.0
 Werkzeug==2.3.7
diff --git a/appengine/flexible_python37_and_earlier/metadata/requirements.txt b/appengine/flexible_python37_and_earlier/metadata/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.1.0; python_version > '3.6'
+Flask==3.0.0; python_version > '3.6'
 Flask==2.0.3; python_version < '3.7'
 gunicorn==20.1.0
 requests[security]==2.31.0
diff --git a/appengine/flexible_python37_and_earlier/multiple_services/gateway-service/requirements.txt b/appengine/flexible_python37_and_earlier/multiple_services/gateway-service/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.1.0; python_version > '3.6'
+Flask==3.0.0; python_version > '3.6'
 Flask==2.0.3; python_version < '3.7'
 gunicorn==20.1.0
 requests==2.31.0
diff --git a/appengine/flexible_python37_and_earlier/multiple_services/static-service/requirements.txt b/appengine/flexible_python37_and_earlier/multiple_services/static-service/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.1.0; python_version > '3.6'
+Flask==3.0.0; python_version > '3.6'
 Flask==2.0.3; python_version < '3.7'
 gunicorn==20.1.0
 requests==2.31.0
diff --git a/appengine/flexible_python37_and_earlier/numpy/requirements.txt b/appengine/flexible_python37_and_earlier/numpy/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.1.0; python_version > '3.6'
+Flask==3.0.0; python_version > '3.6'
 Flask==2.0.3; python_version < '3.7'
 gunicorn==20.1.0
 numpy==1.21.6
diff --git a/appengine/flexible_python37_and_earlier/pubsub/requirements.txt b/appengine/flexible_python37_and_earlier/pubsub/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.1.0; python_version > '3.6'
+Flask==3.0.0; python_version > '3.6'
 Flask==2.0.3; python_version < '3.7'
 google-cloud-pubsub==2.17.0
 gunicorn==20.1.0
diff --git a/appengine/flexible_python37_and_earlier/scipy/requirements.txt b/appengine/flexible_python37_and_earlier/scipy/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.1.0; python_version > '3.6'
+Flask==3.0.0; python_version > '3.6'
 Flask==2.0.3; python_version < '3.7'
 gunicorn==20.1.0
 imageio==2.29.0
diff --git a/appengine/flexible_python37_and_earlier/static_files/requirements.txt b/appengine/flexible_python37_and_earlier/static_files/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.1.0; python_version > '3.6'
+Flask==3.0.0; python_version > '3.6'
 Flask==2.0.3; python_version < '3.7'
 gunicorn==20.1.0
 Werkzeug==2.3.7
diff --git a/appengine/flexible_python37_and_earlier/storage/requirements.txt b/appengine/flexible_python37_and_earlier/storage/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.1.0; python_version > '3.6'
+Flask==3.0.0; python_version > '3.6'
 Flask==2.0.3; python_version < '3.7'
 werkzeug==2.3.7; python_version > '3.7'
 werkzeug==2.0.3; python_version <= '3.7'
diff --git a/appengine/flexible_python37_and_earlier/tasks/requirements.txt b/appengine/flexible_python37_and_earlier/tasks/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.1.0; python_version > '3.6'
+Flask==3.0.0; python_version > '3.6'
 Flask==2.0.3; python_version < '3.7'
 gunicorn==20.1.0
 google-cloud-tasks==2.13.1
diff --git a/appengine/flexible_python37_and_earlier/twilio/requirements.txt b/appengine/flexible_python37_and_earlier/twilio/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.1.0; python_version > '3.6'
+Flask==3.0.0; python_version > '3.6'
 Flask==2.0.3; python_version < '3.7'
 gunicorn==20.1.0
 twilio==8.2.1
diff --git a/appengine/standard/analytics/requirements.txt b/appengine/standard/analytics/requirements.txt
@@ -1,5 +1,5 @@
 Flask==1.1.4; python_version < '3.0'
-Flask==2.1.0; python_version > '3.0'
+Flask==3.0.0; python_version > '3.0'
 requests==2.27.1
 requests-toolbelt==0.10.1
 Werkzeug==1.0.1; python_version < '3.0'
diff --git a/appengine/standard/firebase/firenotes/backend/requirements.txt b/appengine/standard/firebase/firenotes/backend/requirements.txt
@@ -1,5 +1,5 @@
 Flask==1.1.4; python_version < '3.0'
-Flask==2.1.0; python_version > '3.0'
+Flask==3.0.0; python_version > '3.0'
 pyjwt==1.7.1; python_version < '3.0'
 flask-cors==3.0.10
 google-auth==2.17.3; python_version < '3.0'
diff --git a/appengine/standard/firebase/firetactoe/requirements.txt b/appengine/standard/firebase/firetactoe/requirements.txt
@@ -1,5 +1,5 @@
 Flask==1.1.4; python_version < '3.0'
-Flask==2.1.0; python_version > '3.0'
+Flask==3.0.0; python_version > '3.0'
 requests==2.27.1
 requests-toolbelt==0.10.1
 google-auth==1.34.0; python_version < '3.0'
diff --git a/appengine/standard/flask/tutorial/requirements.txt b/appengine/standard/flask/tutorial/requirements.txt
@@ -1,4 +1,4 @@
 Flask==1.1.4; python_version < '3.0'
-Flask==2.1.0; python_version > '3.0'
+Flask==3.0.0; python_version > '3.0'
 Werkzeug==1.0.1; python_version < '3.0'
 Werkzeug==2.3.7; python_version > '3.0'
diff --git a/appengine/standard/mailjet/requirements.txt b/appengine/standard/mailjet/requirements.txt
@@ -1,5 +1,5 @@
 Flask==1.1.4; python_version < '3.0'
-Flask==2.1.0; python_version > '3.0'
+Flask==3.0.0; python_version > '3.0'
 requests==2.27.1
 requests-toolbelt==0.10.1
 mailjet-rest==1.3.4
diff --git a/appengine/standard/migration/taskqueue/counter/requirements.txt b/appengine/standard/migration/taskqueue/counter/requirements.txt
@@ -1,5 +1,5 @@
 Flask==1.1.4; python_version < '3.0'
-Flask==2.1.0; python_version > '3.0'
+Flask==3.0.0; python_version > '3.0'
 google-cloud-datastore==2.15.1; python_version >= "3.0"
 google-cloud-datastore==1.15.5; python_version < "3.0"
 google-cloud-tasks==2.13.1; python_version >= "3.0"
diff --git a/appengine/standard/migration/taskqueue/pull-counter/requirements.txt b/appengine/standard/migration/taskqueue/pull-counter/requirements.txt
@@ -1,5 +1,5 @@
 Flask==1.1.4; python_version < '3.0'
-Flask==2.1.0; python_version > '3.0'
+Flask==3.0.0; python_version > '3.0'
 google-cloud-datastore==2.15.1 ; python_version >= "3.0"
 google-cloud-datastore<2 ; python_version < "3.0"
 google-cloud-pubsub==2.16.0 ; python_version >= "3.0"
diff --git a/appengine/standard/migration/urlfetch/async/requirements.txt b/appengine/standard/migration/urlfetch/async/requirements.txt
@@ -1,5 +1,5 @@
 Flask==1.1.4; python_version < '3.0'
-Flask==2.1.0; python_version > '3.0'
+Flask==3.0.0; python_version > '3.0'
 requests==2.27.1
 requests-futures==1.0.0
 requests-toolbelt==0.10.1
diff --git a/appengine/standard/migration/urlfetch/requests/requirements.txt b/appengine/standard/migration/urlfetch/requests/requirements.txt
@@ -1,5 +1,5 @@
 Flask==1.1.4; python_version < '3.0'
-Flask==2.1.0; python_version > '3.0'
+Flask==3.0.0; python_version > '3.0'
 requests==2.27.1
 requests-toolbelt==0.10.1
 Werkzeug==1.0.1; python_version < '3.0'
diff --git a/appengine/standard/ndb/transactions/requirements.txt b/appengine/standard/ndb/transactions/requirements.txt
@@ -1,4 +1,4 @@
 Flask==1.1.4; python_version < '3.0'
 Flask==2.1.0; python_version > '3.0'
 Werkzeug==1.0.1; python_version < '3.0'
-Werkzeug==2.3.7; python_version > '3.0'
+Werkzeug==2.3.7; python_version > '3.0'
diff --git a/appengine/standard/urlfetch/requests/requirements.txt b/appengine/standard/urlfetch/requests/requirements.txt
@@ -1,5 +1,5 @@
 Flask==1.1.4; python_version < '3.0'
-Flask==2.1.0; python_version > '3.0'
+Flask==3.0.0; python_version > '3.0'
 requests==2.27.1
 requests-toolbelt==0.10.1
 Werkzeug==1.0.1; python_version < '3.0'
diff --git a/profiler/appengine/flexible/requirements.txt b/profiler/appengine/flexible/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.2.3
+Flask==2.3.3
 gunicorn==20.1.0
 google-cloud-profiler==4.0.0
 Werkzeug==2.3.7
diff --git a/profiler/appengine/standard_python37/requirements.txt b/profiler/appengine/standard_python37/requirements.txt
@@ -1,3 +1,3 @@
-Flask==2.2.3
+Flask==2.3.3
 google-cloud-profiler==4.0.0
 Werkzeug==2.3.7

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Flask==2.1.0; python_version > '3.6'`
	`1`	`+Flask==3.0.0; python_version > '3.6'`
`2`	`2`	`Flask==2.0.3; python_version < '3.7'`
`3`	`3`	`gunicorn==20.1.0`
`4`	`4`	`requests[security]==2.31.0`