Merge pull request #444 from weakish/werkzeug

fix: require Werkzeug <1.0.0

related forum post: 22216, 22168, 22182
related ticket: 23058

Author: weakish

Pipfile

@@ -21,7 +21,7 @@ six = ">=1.11.0"
 qiniu = ">=7.1.4,<7.2.4"
 "urllib3" = ">=1.24.3,<=1.25.3"
 requests = ">=2.20.0,<=2.22.0"
-werkzeug = "*"
+Werkzeug = ">=0.11.11,<1.0.0"
 gevent = ">=1.0.2,<2.0.0"
 typing = { version = "*", markers = "python_version < '3.5.0'" }
 pyopenssl = { version = "*", markers = "python_version < '2.7.9'" }

README.md

@@ -25,6 +25,27 @@ cd docs
 make html
 ```
 
+## Run Tests
+
+Configure the following environment variables:
+
+- `APP_ID`
+- `APP_KEY`
+- `MASTER_KEY`
+- `USE_REGION`
+
+Install dependencies:
+
+```sh
+pip install -e .'[test]'
+```
+
+Run tests:
+
+```sh
+nosetests
+```
+
 ## Release a New Version
 
 1. Edit `changelog` and `setup.py` (`version`).

setup.py

@@ -12,7 +12,7 @@
     'qiniu>=7.1.4,<7.2.4',
     'requests>=2.20.0,<=2.22.0',
     'urllib3>=1.24.3,<=1.25.3',
-    'werkzeug',
+    'Werkzeug>=0.11.11,<1.0.0',
     'gevent>=1.0.2,<2.0.0'
 ]
 

tests/test_user.py

@@ -263,7 +263,7 @@ def test_request_password_reset(): # type: () -> None
         User.request_password_reset('wow@leancloud.rocks')
     except LeanCloudError as e:
         assert u'请不要往同一个邮件地址发送太多邮件。' in e.error \
-            or 'Too many emails sent to the same email address' in str(e)
+            or 'Too many emails' in str(e)
 
 
 @with_setup(get_setup_func())
@@ -273,8 +273,8 @@ def test_request_email_verify(): # type: () -> None
     except LeanCloudError as e:
         assert '邮件验证功能' in str(e) \
             or '请不要往同一个邮件地址发送太多邮件' in str(e) \
-            or 'Too many emails sent to the same email address' in str(e)\
-            or 'Please enable verifying user email option in application settings' in str(e)
+            or 'Too many emails' in str(e)\
+            or 'Please enable the option to verify user emails in application settings.' in str(e)
 
 
 @with_setup(get_setup_func())