diff options
author | Djordje Lukic <lukic.djordje@gmail.com> | 2019-10-28 16:54:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-28 16:54:32 +0100 |
commit | f6b6cd22df73466cbe089b4545212905e0a27e31 (patch) | |
tree | 59557bd36aa1be53e93b2604fbe5c0ed739e0b93 | |
parent | ea22d5821c849a6a83da551f9d10dcd5a645bd65 (diff) | |
parent | 8f3c9c58c5096790b3c72d52e8886574a7c90bdd (diff) |
Merge pull request #6987 from docker/bump-1.25.0-rc4
Bump 1.25.0-rc4
-rw-r--r-- | CHANGELOG.md | 2 | ||||
-rw-r--r-- | compose/__init__.py | 2 | ||||
-rwxr-xr-x | script/run/run.sh | 2 | ||||
-rw-r--r-- | tests/unit/project_test.py | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 210aecd4..92ab0f90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Change log ========== -1.25.0-rc3 (2019-10-28) +1.25.0-rc4 (2019-10-28) ------------------- ### Features diff --git a/compose/__init__.py b/compose/__init__.py index 552f91b2..4bd8d724 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.25.0-rc3' +__version__ = '1.25.0-rc4' diff --git a/script/run/run.sh b/script/run/run.sh index f7d6eb35..cb2fb8ca 100755 --- a/script/run/run.sh +++ b/script/run/run.sh @@ -15,7 +15,7 @@ set -e -VERSION="1.25.0-rc3" +VERSION="1.25.0-rc4" IMAGE="docker/compose:$VERSION" diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py index de16febf..6391fac8 100644 --- a/tests/unit/project_test.py +++ b/tests/unit/project_test.py @@ -880,7 +880,8 @@ class ProjectTest(unittest.TestCase): service = 'foo' secret_source = 'bar' - _, filename_path = tempfile.mkstemp() + fd, filename_path = tempfile.mkstemp() + os.close(fd) self.addCleanup(os.remove, filename_path) def mock_get(key): |