Merge 67b799d into d60273b

Miserlou · Oct 19, 2018 · ac9926b · ac9926b
2 parents d60273b + 67b799d
commit ac9926b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -14,6 +14,8 @@ python-dateutil>=2.6.1, <2.7.0
 python-slugify==1.2.4
 PyYAML==3.13
 requests>=2.10.0
+# requests has issues with urllib3 1.24
+urllib3<=1.23
 six>=1.11.0
 toml>=0.9.4
 tqdm==4.19.1

diff --git a/test_requirements.txt b/test_requirements.txt
@@ -6,3 +6,6 @@ mock>=2.0.0
 nose>=1.3.7
 nose-timer==0.6.0
 placebo>=0.8.1
+# requests has issues with urllib3 1.24
+# and if we install 1.24 here python setup.py install keeps both versions
+urllib3<=1.23