Merge branch 'release' of github.com:docker/docker-py

Signed-off-by: Joffrey F <joffrey@docker.com>

5 files changed, 50 insertions, 6 deletions

diff --git a/Jenkinsfile b/Jenkinsfile
index 9e1b491..a83d7bf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,7 @@ def imageNamePy3
 def images = [:]
 
 
-def dockerVersions = ["1.13.1", "17.04.0-ce", "17.05.0-ce", "17.06.0-ce"]
+def dockerVersions = ["1.13.1", "17.04.0-ce", "17.05.0-ce", "17.06.0-ce", "17.07.0-ce-rc3"]
 
 def buildImage = { name, buildargs, pyTag ->
   img = docker.image(name)
@@ -34,7 +34,7 @@ def buildImages = { ->
 }
 
 def getAPIVersion = { engineVersion ->
-  def versionMap = ['1.13.': '1.26', '17.04': '1.27', '17.05': '1.29', '17.06': '1.30']
+  def versionMap = ['1.13.': '1.26', '17.04': '1.27', '17.05': '1.29', '17.06': '1.30', '17.07': '1.31']
   return versionMap[engineVersion.substring(0, 5)]
 }
 
diff --git a/Makefile b/Makefile
index e4cd3f7..c6c6d56 100644
--- a/Makefile
+++ b/Makefile
@@ -41,8 +41,8 @@ integration-test: build
 integration-test-py3: build-py3
 	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock docker-sdk-python3 py.test tests/integration/${file}
 
-TEST_API_VERSION ?= 1.29
-TEST_ENGINE_VERSION ?= 17.05.0-ce
+TEST_API_VERSION ?= 1.30
+TEST_ENGINE_VERSION ?= 17.06.0-ce
 
 .PHONY: integration-dind
 integration-dind: build build-py3
diff --git a/docker/constants.py b/docker/constants.py
index 91a6528..6de8fad 100644
--- a/docker/constants.py
+++ b/docker/constants.py
@@ -1,7 +1,7 @@
 import sys
 from .version import version
 
-DEFAULT_DOCKER_API_VERSION = '1.26'
+DEFAULT_DOCKER_API_VERSION = '1.30'
 MINIMUM_DOCKER_API_VERSION = '1.21'
 DEFAULT_TIMEOUT_SECONDS = 60
 STREAM_HEADER_SIZE_BYTES = 8
diff --git a/docker/version.py b/docker/version.py
index a7452d4..066b62e 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1,2 +1,2 @@
-version = "2.5.0-dev"
+version = "2.5.0"
 version_info = tuple([int(d) for d in version.split("-")[0].split(".")])
diff --git a/docs/change-log.md b/docs/change-log.md
index 194f734..199e5ce 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -1,6 +1,50 @@
 Change log
 ==========
 
+2.5.0
+-----
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/34?closed=1)
+
+### Features
+
+* Added support for the `squash` parameter in `APIClient.build` and
+  `DockerClient.images.build`.
+* When using API version 1.23 or above, `load_image` will now return a
+  generator of progress as JSON `dict`s.
+* `remove_image` now returns the content of the API's response.
+
+
+### Bugfixes
+
+* Fixed an issue where the `auto_remove` parameter in
+  `DockerClient.containers.run` was not taken into account.
+* Fixed a bug where `.dockerignore` patterns starting with a slash
+  were ignored.
+* Fixed an issue with the handling of `**` patterns in `.dockerignore`
+* Fixed a bug where building `FROM` a private Docker Hub image when not
+  using a cred store would fail.
+* Fixed a bug where calling `create_service` or `update_service` with
+  `task_template` as a `dict` would raise an exception.
+* Fixed the handling of TTY-enabled containers in `attach` and `exec_run`.
+* `DockerClient.containers.run` will no longer attempt to stream logs if the
+  log driver doesn't support the operation.
+
+### Miscellaneous
+
+* Added extra requirements for better TLS support on some platforms.
+  These can be installed or required through the `docker[tls]` notation.
+
+2.4.2
+-----
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/36?closed=1)
+
+### Bugfixes
+
+* Fixed a bug where the `split_port` utility would raise an exception when
+  passed a non-string argument.
+
 2.4.0
 -----