[go: up one dir, main page]

Skip to content

Commit

Permalink
fix(Flask): Mass fix for broken Werkzeug dependency (#10714)
Browse files Browse the repository at this point in the history
* fix(Flask): Mass fix for broken Werkzeug dependency

* fix(Flask): Version and requirements tweaks

* fix(Flask): Version and requirements tweaks

* (chore): update Flask to 3.0.0 (#10713)

* Update Flask to 3.0.0

Many tests returning flaky due to url_quote being removed from werkzeug
(previously deprecated).

Flask 3.0.0 has Python 3.8+ support, so should be updatable.

* revert (separate test failures)

* chore: update Flask to 3.0.0

* fix(deps): Werkzeug tweaks

* fix(deps): revert changes to avoid trigerring broken tests

---------

Co-authored-by: Katie McLaughlin <katie@glasnt.com>
  • Loading branch information
rsamborski and glasnt committed Oct 5, 2023
1 parent 87c3186 commit 3088c64
Show file tree
Hide file tree
Showing 76 changed files with 98 additions and 10 deletions.
1 change: 1 addition & 0 deletions appengine/flexible/analytics/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ Flask==2.1.0; python_version > '3.6'
Flask==2.0.3; python_version < '3.7'
gunicorn==20.1.0
requests[security]==2.31.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions appengine/flexible/hello_world/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Flask==2.1.1
gunicorn==20.1.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions appengine/flexible/twilio/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ Flask==2.1.0; python_version > '3.6'
Flask==2.0.3; python_version < '3.7'
gunicorn==20.1.0
twilio==8.2.1
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions appengine/flexible/websockets/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ Flask-Sockets==0.2.1
gunicorn==20.1.0
requests==2.31.0
markupsafe===2.0.1
Werkzeug==1.0.1;
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ Flask==2.1.0; python_version > '3.6'
Flask==2.0.3; python_version < '3.7'
gunicorn==20.1.0
requests[security]==2.31.0
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ Flask==2.1.0; python_version > '3.6'
Flask==2.0.3; python_version < '3.7'
google-cloud-datastore==2.15.2
gunicorn==20.1.0
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Flask==2.1.0; python_version > '3.6'
Flask==2.0.3; python_version < '3.7'
gunicorn==20.1.0
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Flask==2.1.0; python_version > '3.6'
Flask==2.0.3; python_version < '3.7'
gunicorn==20.1.0
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Flask==2.1.0; python_version > '3.6'
Flask==2.0.3; python_version < '3.7'
gunicorn==20.1.0
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ Flask==2.1.0; python_version > '3.6'
Flask==2.0.3; python_version < '3.7'
gunicorn==20.1.0
requests[security]==2.31.0
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ Flask==2.1.0; python_version > '3.6'
Flask==2.0.3; python_version < '3.7'
gunicorn==20.1.0
requests==2.31.0
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ Flask==2.1.0; python_version > '3.6'
Flask==2.0.3; python_version < '3.7'
gunicorn==20.1.0
requests==2.31.0
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ Flask==2.1.0; python_version > '3.6'
Flask==2.0.3; python_version < '3.7'
gunicorn==20.1.0
numpy==1.21.6
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ Flask==2.1.0; python_version > '3.6'
Flask==2.0.3; python_version < '3.7'
google-cloud-pubsub==2.17.0
gunicorn==20.1.0
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ imageio==2.29.0
numpy==1.21.6
pillow==10.0.1
scipy==1.7.3
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Flask==2.1.0; python_version > '3.6'
Flask==2.0.3; python_version < '3.7'
gunicorn==20.1.0
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Flask==2.1.0; python_version > '3.6'
Flask==2.0.3; python_version < '3.7'
werkzeug==2.3.6; python_version > '3.7'
werkzeug==2.3.7; python_version > '3.7'
werkzeug==2.0.3; python_version <= '3.7'
google-cloud-storage==2.9.0
gunicorn==20.1.0
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ Flask==2.1.0; python_version > '3.6'
Flask==2.0.3; python_version < '3.7'
gunicorn==20.1.0
google-cloud-tasks==2.13.1
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ Flask==2.1.0; python_version > '3.6'
Flask==2.0.3; python_version < '3.7'
gunicorn==20.1.0
twilio==8.2.1
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ Flask-Sockets==0.2.1
gunicorn==20.1.0
requests==2.31.0
markupsafe===2.0.1
Werkzeug==1.0.1;
2 changes: 2 additions & 0 deletions appengine/standard/analytics/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ Flask==1.1.4; python_version < '3.0'
Flask==2.1.0; python_version > '3.0'
requests==2.27.1
requests-toolbelt==0.10.1
Werkzeug==1.0.1; python_version < '3.0'
Werkzeug==2.3.7; python_version > '3.0'
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ google-auth==2.17.3; python_version < '3.0'
google-auth==2.17.3; python_version > '3.0'
requests==2.27.1
requests-toolbelt==0.10.1
Werkzeug==1.0.1; python_version < '3.0'
Werkzeug==2.3.7; python_version > '3.0'
2 changes: 2 additions & 0 deletions appengine/standard/firebase/firetactoe/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ requests-toolbelt==0.10.1
google-auth==1.34.0; python_version < '3.0'
google-auth==2.17.3; python_version > '3.0'
functools32==3.2.3.post2; python_version < "3"
Werkzeug==1.0.1; python_version < '3.0'
Werkzeug==2.3.7; python_version > '3.0'
1 change: 1 addition & 0 deletions appengine/standard/flask/tutorial/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +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'
2 changes: 2 additions & 0 deletions appengine/standard/iap/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +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'
2 changes: 2 additions & 0 deletions appengine/standard/mailjet/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ Flask==2.1.0; python_version > '3.0'
requests==2.27.1
requests-toolbelt==0.10.1
mailjet-rest==1.3.4
Werkzeug==1.0.1; python_version < '3.0'
Werkzeug==2.3.7; python_version > '3.0'
2 changes: 2 additions & 0 deletions appengine/standard/migration/memorystore/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ redis==4.5.4; python_version > '3.0'
redis<5; python_version < '3.0'
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'
2 changes: 2 additions & 0 deletions appengine/standard/migration/ndb/overview/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ googleapis_common_protos
google-cloud-ndb
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'
2 changes: 2 additions & 0 deletions appengine/standard/migration/ndb/redis_cache/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ googleapis_common_protos
google-cloud-ndb
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'
2 changes: 2 additions & 0 deletions appengine/standard/migration/storage/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ google-cloud-storage==1.44.0; python_version < '3.7'
google-cloud-storage==2.8.0; python_version > '3.6'
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'
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ 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"
google-cloud-tasks==1.5.2; python_version < "3.0"
Werkzeug==1.0.1; python_version < '3.0'
Werkzeug==2.3.7; python_version > '3.0'
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ google-cloud-datastore<2 ; python_version < "3.0"
google-cloud-pubsub==2.16.0 ; python_version >= "3.0"
# 1.7.0 is the latest compatible version for Python 2.
google-cloud-pubsub==1.7.2 ; python_version < "3.0"
Werkzeug==1.0.1; python_version < '3.0'
Werkzeug==2.3.7; python_version > '3.0'
2 changes: 2 additions & 0 deletions appengine/standard/migration/urlfetch/async/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ Flask==2.1.0; python_version > '3.0'
requests==2.27.1
requests-futures==1.0.0
requests-toolbelt==0.10.1
Werkzeug==1.0.1; python_version < '3.0'
Werkzeug==2.3.7; python_version > '3.0'
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ Flask==1.1.4; python_version < '3.0'
Flask==2.1.0; python_version > '3.0'
requests==2.27.1
requests-toolbelt==0.10.1
Werkzeug==1.0.1; python_version < '3.0'
Werkzeug==2.3.7; python_version > '3.0'
2 changes: 2 additions & 0 deletions appengine/standard/ndb/transactions/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +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'
2 changes: 2 additions & 0 deletions appengine/standard/urlfetch/requests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ Flask==1.1.4; python_version < '3.0'
Flask==2.1.0; python_version > '3.0'
requests==2.27.1
requests-toolbelt==0.10.1
Werkzeug==1.0.1; python_version < '3.0'
Werkzeug==2.3.7; python_version > '3.0'
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Flask==2.0.1
appengine-python-standard>=0.2.3
appengine-python-standard>=0.2.3
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Flask==2.0.1
appengine-python-standard>=0.3.1
appengine-python-standard>=0.3.1
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Flask==2.1.2
appengine-python-standard>=1.0.0
appengine-python-standard>=1.0.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions bigquery/remote-function/document/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Flask==2.2.2
functions-framework==3.3.0
google-cloud-documentai==2.15.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions bigquery/remote-function/translate/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Flask==2.2.2
functions-framework==3.3.0
google-cloud-translate==3.11.1
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions bigquery/remote-function/vision/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Flask==2.2.2
functions-framework==3.3.0
google-cloud-vision==3.4.2
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions cloud-media-livestream/keypublisher/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ requests==2.31.0
signxml==3.2.0
pytest==7.3.1
pytest-mock==3.10.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions cloud-sql/mysql/sqlalchemy/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ PyMySQL==1.1.0
gunicorn==20.1.0
cloud-sql-python-connector==1.2.4
functions-framework==3.3.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions cloud-sql/postgres/sqlalchemy/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ SQLAlchemy==2.0.17
cloud-sql-python-connector==1.2.4
gunicorn==20.1.0
functions-framework==3.3.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions cloud-sql/sql-server/sqlalchemy/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ SQLAlchemy==2.0.17
cloud-sql-python-connector==1.2.4
sqlalchemy-pytds==1.0.0
functions-framework==3.3.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions cloud_scheduler/snippets/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Flask==2.2.3
gunicorn==20.1.0
google-cloud-scheduler==2.11.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions compute/managed-instances/demo/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Flask==2.1.0
requests==2.31.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions datastore/cloud-ndb/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
google-cloud-ndb==2.2.1
# [END ndb_version]
Flask==2.1.0
Werkzeug==2.3.7
3 changes: 2 additions & 1 deletion dialogflow-cx/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
google-cloud-dialogflow-cx==1.21.0
Flask==2.2.2
python-dateutil==2.8.2
functions-framework==3.3.0
functions-framework==3.3.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions dialogflow/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ Flask==2.2.2
pyaudio==0.2.13
termcolor==2.3.0
functions-framework==3.3.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions endpoints/getting-started/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ pyyaml==6.0
requests==2.31.0
google-auth==2.19.1
google-auth-oauthlib==1.0.0
Werkzeug==2.3.7
2 changes: 1 addition & 1 deletion eventarc/audit_iam/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ Flask==3.0.0
gunicorn==20.1.0
google-events==0.10.0
cloudevents==1.9.0
googleapis-common-protos==1.59.0
googleapis-common-protos==1.59.0
2 changes: 1 addition & 1 deletion eventarc/storage_handler/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Flask==3.0.0
gunicorn==20.1.0
google-events==0.7.0
cloudevents==1.9.0
cloudevents==1.9.0
3 changes: 2 additions & 1 deletion functions/v2/response_streaming/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Flask==2.2.2
functions-framework==3.3.0
google-cloud-bigquery==3.11.4
pytest==7.2.1
pytest==7.2.1
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions iap/app_engine_app/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Flask==2.1.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions iap/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ google-auth==2.19.1
gunicorn==20.1.0
requests==2.31.0
requests-toolbelt==1.0.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions memorystore/redis/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@
Flask==2.1.0
gunicorn==20.1.0
redis==5.0.0
Werkzeug==2.3.7
# [END memorystore_requirements]
1 change: 1 addition & 0 deletions monitoring/opencensus/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ opencensus-ext-prometheus==0.2.1
prometheus-client==0.17.0
prometheus-flask-exporter==0.22.4
requests==2.31.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions monitoring/prometheus/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ googleapis-common-protos==1.59.1
prometheus-client==0.17.0
prometheus-flask-exporter==0.22.4
requests==2.31.0
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Flask==2.3.0
gunicorn==20.1.0
tensorflow==2.12.0
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ Flask==2.2.2
earthengine-api==0.1.358
gunicorn==20.1.0
tensorflow==2.12.0
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ google-cloud-aiplatform==1.25.0
gunicorn==20.1.0
pandas==2.0.1
tensorflow==2.12.0
Werkzeug==2.3.7
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Flask==2.2.2
gunicorn==20.1.0
Werkzeug==2.3.7

# Local packages.
./weather-data
Expand Down
1 change: 1 addition & 0 deletions profiler/appengine/flexible/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Flask==2.2.3
gunicorn==20.1.0
google-cloud-profiler==4.0.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions profiler/appengine/standard_python37/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Flask==2.2.3
google-cloud-profiler==4.0.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions run/hello-broken/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ pytest==7.0.1; python_version > "3.0"
# pin pytest to 4.6.11 for Python2.
pytest==7.0.1; python_version < "3.0"
gunicorn==20.1.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions run/helloworld/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Flask==2.1.0
gunicorn==20.1.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions run/logging-manual/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ pytest==7.0.1; python_version > "3.0"
# pin pytest to 4.6.11 for Python2.
pytest==7.0.1; python_version < "3.0"
gunicorn==20.1.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions run/markdown-preview/editor/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ Flask==2.1.0
gunicorn==20.1.0
google-auth==2.19.1
requests==2.31.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions run/markdown-preview/renderer/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ Flask==2.1.0
gunicorn==20.1.0
Markdown==3.4.3
bleach==6.0.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions run/pubsub/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ pytest==7.0.1; python_version > "3.0"
# pin pytest to 4.6.11 for Python2.
pytest==7.0.1; python_version < "3.0"
gunicorn==20.1.0
Werkzeug==2.3.7
3 changes: 2 additions & 1 deletion run/service-auth/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
google-auth==2.19.1
requests==2.31.0
Flask==2.1.2
gunicorn==20.1.0
gunicorn==20.1.0
Werkzeug==2.3.7
1 change: 1 addition & 0 deletions run/system-package/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Flask==2.1.0
pytest==7.0.1
gunicorn==20.1.0
Werkzeug==2.3.7

0 comments on commit 3088c64

Please sign in to comment.