Merge pull request #6987 from docker/bump-1.25.0-rc4

Bump 1.25.0-rc4

CHANGELOG.md

@@ -1,7 +1,7 @@
 Change log
 ==========
 
-1.25.0-rc3 (2019-10-28)
+1.25.0-rc4 (2019-10-28)
 -------------------
 
 ### Features

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'

script/run/run.sh

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

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):