Fix urllib3 dependency conflict

Signed-off-by: Guillem Duran <[email protected]>

Author: Guillem Duran

requirements.txt

@@ -4,11 +4,12 @@ numpy==1.14.0
 scipy==1.0.0
 clint==0.5.1
 google-cloud-storage==1.2.0
+# Requests should be first to avoid dependency problems on urllib3
+requests==2.21.0
 dulwich==0.19.11
 jinja2 ==2.10
 humanize==0.5.1
 python-dateutil==2.7.3
-requests==2.21.0
 pygtrie==2.3
 xxhash==1.2.0
 spdx==2.5.0

setup.py

@@ -31,11 +31,11 @@
                       "scipy>=1.0,<2.0",
                       "clint>=0.5.0,<0.6",
                       "google-cloud-storage>=1.2,<=1.2.0",
+                      "requests >=2.0,<3.0",
                       "dulwich>=0.19,<1.0",
                       "jinja2 >=2.0,<3.0",
                       "humanize>=0.5.0,<0.6",
                       "python-dateutil>=2.0,<3.0",
-                      "requests >=2.0,<3.0",
                       "typing;python_version<'3.5'",
                       "pygtrie>=1.0,<3.0",
                       "xxhash>=1.0,<2.0",