clean up merge

2020-02-10 16:36:40 -08:00 · 2020-02-10 16:36:40 -08:00 · d92b64aa27
commit d92b64aa27
parent 2f8086e8c8
2 changed files with 3 additions and 5 deletions
--- a/CHANGES.rst
+++ b/CHANGES.rst
@ -231,11 +231,9 @@ Released 2018-04-26
 Version 0.12.5
 --------------

-Released on February 10 2020
+Released 2020-02-10

-   Pin Werkzeug to < 1.0.0.  (`#3497`_)
-
-.. _#3497: https://github.com/pallets/flask/issues/3497
+-   Pin Werkzeug to < 1.0.0. :issue:`3497`


 Version 0.12.4
--- a/setup.py
+++ b/setup.py
@ -50,7 +50,7 @@ setup(
    include_package_data=True,
    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
    install_requires=[
-        'Werkzeug>=0.7,<1.0',
+        'Werkzeug>=0.14',
        'Jinja2>=2.4',
        'itsdangerous>=0.21',
        'click>=2.0',