Merge 4779fc42d0 into cc66213e57

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 ci:
-  autoupdate_branch: "2.2.x"
+  autoupdate_branch: "2.1.x"
   autoupdate_schedule: monthly
 repos:
   - repo: https://github.com/asottile/pyupgrade
@@ -16,11 +16,11 @@ repos:
         args: ["--application-directories", "src"]
         additional_dependencies: ["setuptools>60.9"]
   - repo: https://github.com/psf/black
-    rev: 22.8.0
+    rev: 22.6.0
     hooks:
       - id: black
   - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+    rev: 5.0.2
     hooks:
       - id: flake8
         additional_dependencies:

CHANGES.rst

@@ -1,45 +1,9 @@
-Version 2.3.0
--------------
-
-Unreleased
-
-
-Version 2.2.3
--------------
-
-Unreleased
-
--   Autoescaping is now enabled by default for ``.svg`` files. Inside
-    templates this behavior can be changed with the ``autoescape`` tag.
-    :issue:`4831`
-
-Version 2.2.2
--------------
-
-Released 2022-08-08
-
--   Update Werkzeug dependency to >= 2.2.2. This includes fixes related
-    to the new faster router, header parsing, and the development
-    server. :pr:`4754`
--   Fix the default value for ``app.env`` to be ``"production"``. This
-    attribute remains deprecated. :issue:`4740`
-
-
-Version 2.2.1
--------------
-
-Released 2022-08-03
-
--   Setting or accessing ``json_encoder`` or ``json_decoder`` raises a
-    deprecation warning. :issue:`4732`
-
-
 Version 2.2.0
 -------------
 
 Released 2022-08-01
 
--   Remove previously deprecated code. :pr:`4667`
+-   Remove previously deprecated code. :pr:`4337`
 
     -   Old names for some ``send_file`` parameters have been removed.
         ``download_name`` replaces ``attachment_filename``, ``max_age``
@@ -80,18 +44,18 @@ Released 2022-08-01
         provider can be set to use a different JSON library.
         ``flask.jsonify`` will call ``app.json.response``, other
         functions in ``flask.json`` will call corresponding functions in
-        ``app.json``. :pr:`4692`
+        ``app.json``. :pr:`4688`
 
 -   JSON configuration is moved to attributes on the default
     ``app.json`` provider. ``JSON_AS_ASCII``, ``JSON_SORT_KEYS``,
     ``JSONIFY_MIMETYPE``, and ``JSONIFY_PRETTYPRINT_REGULAR`` are
-    deprecated. :pr:`4692`
+    deprecated. :pr:`4688`
 -   Setting custom ``json_encoder`` and ``json_decoder`` classes on the
     app or a blueprint, and the corresponding ``json.JSONEncoder`` and
     ``JSONDecoder`` classes, are deprecated. JSON behavior can now be
-    overridden using the ``app.json`` provider interface. :pr:`4692`
+    overridden using the ``app.json`` provider interface. :pr:`4688`
 -   ``json.htmlsafe_dumps`` and ``json.htmlsafe_dump`` are deprecated,
-    the function is built-in to Jinja now. :pr:`4692`
+    the function is built-in to Jinja now. :pr:`4688`
 -   Refactor ``register_error_handler`` to consolidate error checking.
     Rewrite some error messages to be more consistent. :issue:`4559`
 -   Use Blueprint decorators and functions intended for setup after

setup.py

@@ -4,7 +4,7 @@ from setuptools import setup
 setup(
     name="Flask",
     install_requires=[
-        "Werkzeug >= 2.2.2",
+        "Werkzeug >= 2.2.0",
         "Jinja2 >= 3.0",
         "itsdangerous >= 2.0",
         "click >= 8.0",