diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c4db21308c..fd5d3a5b17 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,7 @@ CHANGELOG 1.16.2.dev ========== +* bug-fix: add version bound for requests module to avoid version conflicts between docker-compose and docker-py * bug-fix: Remove unnecessary dependency tensorflow * doc-fix: Change ``distribution`` to ``distributions`` * bug-fix: Increase docker-compose http timeout and health check timeout to 120. diff --git a/setup.py b/setup.py index f1cc739284..303da59b89 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ def read(fname): # Declare minimal set for installation required_packages = ['boto3>=1.9.55', 'numpy>=1.9.0', 'protobuf>=3.1', 'scipy>=0.19.0', 'urllib3>=1.21', 'PyYAML>=3.2, <4', 'protobuf3-to-dict>=0.1.5', - 'docker-compose>=1.23.0'] + 'docker-compose>=1.23.0', 'requests>=2.14.2, !=2.18.0, <2.21'] # enum is introduced in Python 3.4. Installing enum back port if sys.version_info < (3, 4):