diff --git a/CHANGELOG.md b/CHANGELOG.md index 78f51227242..9a264d4ec9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,37 @@ Change log ========== +1.26.0 (2020-04-29) +------------------- + +### Features + +- Add `docker context` support + +- Add missing test dependency `ddt` to `setup.py` + +- Add `--attach-dependencies` to command `up` for attaching to dependencies + +- Allow compatibility option with `COMPOSE_COMPATIBILITY` environment variable + +- Bump `Pytest` to 5.3.4 and add refactor compatibility with new version + +- Bump `OpenSSL` from 1.1.1f to 1.1.1g + +### Bugs + +- Properly escape values coming from env_files + +- Sync compose-schemas with upstream (docker/cli) + +- Remove `None` entries on exec command + +- Add `python-dotenv` to delegate `.env` file processing + +- Don't adjust output on terminal width when piped into another command + +- Show an error message when `version` attribute is malformed + 1.25.5 (2020-02-04) ------------------- diff --git a/compose/__init__.py b/compose/__init__.py index 6d98c8f5e5e..a279559fb12 100644 --- a/compose/__init__.py +++ b/compose/__init__.py @@ -1,4 +1,4 @@ from __future__ import absolute_import from __future__ import unicode_literals -__version__ = '1.26.0-rc3' +__version__ = '1.26.0-rc4' diff --git a/script/run/run.sh b/script/run/run.sh index f6dbe11dc23..2fd0b9d576c 100755 --- a/script/run/run.sh +++ b/script/run/run.sh @@ -15,7 +15,7 @@ set -e -VERSION="1.26.0-rc3" +VERSION="1.26.0-rc4" IMAGE="docker/compose:$VERSION"