Merge pull request #2347 from docker/resync-release

Resync release branch with master

docker/version.py

@@ -1,2 +1,2 @@
-version = "4.0.0-dev"
+version = "4.1.0-dev"
 version_info = tuple([int(d) for d in version.split("-")[0].split(".")])

docs/change-log.md

@@ -1,6 +1,54 @@
 Change log
 ==========
 
+4.0.0
+-----
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/57?closed=1)
+
+### Breaking changes
+
+- Support for Python 3.3 and Python 3.4 has been dropped
+- `APIClient.update_service`, `APIClient.init_swarm`, and
+  `DockerClient.swarm.init` now return a `dict` from the API's response body
+- In `APIClient.build` and `DockerClient.images.build`, the `use_config_proxy`
+  parameter now defaults to True
+- `init_path` is no longer a valid parameter for `HostConfig`
+
+### Features
+
+- It is now possible to provide `SCTP` ports for port mappings
+- `ContainerSpec`s now support the `init` parameter
+- `DockerClient.swarm.init` and `APIClient.init_swarm` now support the
+  `data_path_addr` parameter
+- `APIClient.update_swarm` and `DockerClient.swarm.update` now support the
+  `rotate_manager_unlock_key` parameter
+- `APIClient.update_service` returns the API's response body as a `dict`
+- `APIClient.init_swarm`, and `DockerClient.swarm.init` now return the API's
+  response body as a `dict`
+
+### Bugfixes
+
+- Fixed `PlacementPreference` instances to produce a valid API type
+- Fixed a bug where not setting a value for `buildargs` in `build` could cause
+  the library to attempt accessing attributes of a `None` value
+- Fixed a bug where setting the `volume_driver` parameter in
+  `DockerClient.containers.create` would result in an error
+- `APIClient.inspect_distribution` now correctly sets the authentication
+  headers on the request, allowing it to be used with private repositories
+  This change also applies to `DockerClient.get_registry_data`
+
+3.7.2
+-----
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/59?closed=1)
+
+### Bugfixes
+
+* Fix base_url to keep TCP protocol on utils.py by letting the responsability of changing the
+protocol to `parse_host` afterwards, letting `base_url` with the original value.
+* XFAIL test_attach_stream_and_cancel on TLS
+
 3.7.1
 -----
 

tests/integration/api_container_test.py

@@ -1252,6 +1252,9 @@ class AttachContainerTest(BaseAPIIntegrationTest):
     @pytest.mark.timeout(10)
     @pytest.mark.skipif(os.environ.get('DOCKER_HOST', '').startswith('ssh://'),
                         reason='No cancellable streams over SSH')
+    @pytest.mark.xfail(condition=os.environ.get('DOCKER_TLS_VERIFY') or
+                       os.environ.get('DOCKER_CERT_PATH'),
+                       reason='Flaky test on TLS')
     def test_attach_stream_and_cancel(self):
         container = self.client.create_container(
             BUSYBOX, 'sh -c "sleep 2 && echo hello && sleep 60"',