Merge pull request #6616 from docker/bump-1.24.0

Bump 1.24.0

CHANGELOG.md

@@ -49,7 +49,7 @@ Change log
 
 - Fix `CTRL+C` issues by enabling `bootloader_ignore_signals` in `pyinstaller`
 
-- Bump `docker-py` version to `3.7.1` to fix SSH issues
+- Bump `docker-py` version to `3.7.2` to fix SSH and proxy config issues
 
 - Fix release script and some typos on release documentation
 

compose/__init__.py

@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.24.0-rc3'
+__version__ = '1.24.0'

requirements.txt

@@ -3,7 +3,7 @@ cached-property==1.3.0
 certifi==2017.4.17
 chardet==3.0.4
 colorama==0.4.0; sys_platform == 'win32'
-docker==3.7.1
+docker==3.7.2
 docker-pycreds==0.4.0
 dockerpty==0.4.1
 docopt==0.6.2

script/release/release/pypi.py

@@ -18,7 +18,7 @@ def pypi_upload(args):
             'dist/docker-compose-{}*.tar.gz'.format(rel)
         ])
     except HTTPError as e:
-        if e.response.status_code == 400 and 'File already exists' in e.message:
+        if e.response.status_code == 400 and 'File already exists' in str(e):
             if not args.finalize_resume:
                 raise ScriptError(
                     'Package already uploaded on PyPi.'

script/run/run.sh

@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.24.0-rc3"
+VERSION="1.24.0"
 IMAGE="docker/compose:$VERSION"