1berry/docker-compose
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6616 from docker/bump-1.24.0

Browse Source 
Bump 1.24.0
This commit is contained in:
Ulysses Souza 2019-03-28 18:58:40 +01:00 committed by GitHub
commit d9fa8158c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -49,7 +49,7 @@ Change log
- Fix `CTRL+C` issues by enabling `bootloader_ignore_signals` in `pyinstaller` - 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 - Fix release script and some typos on release documentation

2
compose/__init__.py
View File

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

2
requirements.txt
View File

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

2
script/release/release/pypi.py
View File

@ -18,7 +18,7 @@ def pypi_upload(args):
'dist/docker-compose-{}*.tar.gz'.format(rel) 'dist/docker-compose-{}*.tar.gz'.format(rel)
]) ])
except HTTPError as e: 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: if not args.finalize_resume:
raise ScriptError( raise ScriptError(
'Package already uploaded on PyPi.' 'Package already uploaded on PyPi.'

2
script/run/run.sh
View File

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