Skip to content

Commit c042a6c

Browse files
yangawsjesterhazy
authored andcommitted
change version range for requests dependency (#533)
* Define version range of requests module to work with docker-compose and docker * Update change log * Fix change log
1 parent 9cf38de commit c042a6c

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ CHANGELOG
55
1.16.2.dev
66
==========
77

8+
* bug-fix: add version bound for requests module to avoid version conflicts between docker-compose and docker-py
89
* bug-fix: Remove unnecessary dependency tensorflow
910
* doc-fix: Change ``distribution`` to ``distributions``
1011
* bug-fix: Increase docker-compose http timeout and health check timeout to 120.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def read(fname):
3535
# Declare minimal set for installation
3636
required_packages = ['boto3>=1.9.55', 'numpy>=1.9.0', 'protobuf>=3.1', 'scipy>=0.19.0',
3737
'urllib3>=1.21', 'PyYAML>=3.2, <4', 'protobuf3-to-dict>=0.1.5',
38-
'docker-compose>=1.23.0']
38+
'docker-compose>=1.23.0', 'requests>=2.14.2, !=2.18.0, <2.21']
3939

4040
# enum is introduced in Python 3.4. Installing enum back port
4141
if sys.version_info < (3, 4):

0 commit comments

Comments
 (0)