Merge pull request #203 from mbohlool/master

Exclude urllib3 version 1.21 from depedencies as it breaks our code
2017-04-26 13:52:11 -07:00 · 2017-04-26 13:52:11 -07:00 · 3b5569a0d7
commit 3b5569a0d7
parent 763ada98fc 7aec646a6d
2 changed files with 2 additions and 2 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -2,7 +2,7 @@ certifi>=14.05.14 # MPL
 six>=1.9.0  # MIT
 python-dateutil>=2.5.3  # BSD
 setuptools>=21.0.0  # PSF/ZPL
-urllib3>=1.19.1,<=1.20  # MIT
+urllib3>=1.19.1,!=1.20  # MIT
 pyyaml>=3.12  # MIT
 oauth2client>=4.0.0  # Apache-2.0
 ipaddress>=1.0.17  # PSF
--- a/setup.py
+++ b/setup.py
@ -33,7 +33,7 @@ REQUIRES = [
    "oauth2client",
    "setuptools",
    "six",
-    "urllib3 (>=1.19.1,<=1.20)",
+    "urllib3!=1.21",
    "python-dateutil",
    "pyyaml",
    "websocket-client",