Merge pull request #93 from Guillemdb/master

Fix dependency conflict and wrong badge link.

Author: vmarkovtsev

README.md

@@ -1,4 +1,4 @@
-# Modelforge [![docs on gitbook](https://img.shields.io/badge/docs-gitbook-brightgreen.svg)](https://docs.sourced.tech/modelforge/) [![Build Status](https://travis-ci.org/src-d/modelforge.svg)](https://travis-ci.org/src-d/modelforge) [![codecov](https://codecov.io/github/src-d/modelforge/coverage.svg)](https://codecov.io/gh/src-d/modelforge) [![PyPI](https://img.shields.io/pypi/v/modelforge.svg)](https://pypi.python.org/pypi/modelforge)
+# Modelforge [![docs on gitbook](https://img.shields.io/badge/docs-gitbook-brightgreen.svg)](https://docs.sourced.tech/modelforge/) [![Build Status](https://travis-ci.com/src-d/modelforge.svg)](https://travis-ci.com/src-d/modelforge)[![codecov](https://codecov.io/github/src-d/modelforge/coverage.svg)](https://codecov.io/gh/src-d/modelforge)[![PyPI](https://img.shields.io/pypi/v/modelforge.svg)](https://pypi.python.org/pypi/modelforge)
 
 Modelforge is a foundation for sharing trained machine learning models. It is a set of command line
 tools and a Python library. Modelforge maintains model files in a third-party remote storage service

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 before dulwich to avoid urllib3 version conflict
+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,12 @@
                       "scipy>=1.0,<2.0",
                       "clint>=0.5.0,<0.6",
                       "google-cloud-storage>=1.2,<=1.2.0",
+                      # requests should be before dulwich to avoid urllib3 version conflict
+                      "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",