Merge 2920c8f into 576102b

datarobot · Feb 11, 2019 · 1d258df · 1d258df
2 parents 576102b + 2920c8f
commit 1d258df
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,6 +29,7 @@ install:
   source terryfy/travis_tools.sh; get_python_environment  $pydist $pyver; fi
 - pip install -U pip wheel setuptools
 - pip install -r requirements.txt
+- if [ $pyver != '2.7' ]; then pip uninstall -y futures; fi
 - pip install -r requirements-test.txt
 - pip install coveralls
 script:

diff --git a/Dockerfile-3.5 b/Dockerfile-3.5
@@ -5,6 +5,7 @@ COPY requirements.txt requirements-test.txt /opt/project/
 WORKDIR /opt/project
 
 RUN pip install -r requirements.txt -r requirements-test.txt
+RUN pip uninstall -y requests
 
 COPY . /opt/project
 

diff --git a/README.rst b/README.rst
@@ -209,3 +209,4 @@ batch-scoring script handles standart `HTTP_PROXY`, `HTTPS_PROXY`, `NO_PROXY` en
   export HTTPS_PROXY=http://192.168.1.3:3128
   export NO_PROXY=noproxy.domain.com
 
+