Merge branch 'release'

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

docs/change-log.md

 Change log
 ==========
 
+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
 -----
 

scripts/versions.py

@@ -72,5 +72,6 @@ def main():
         results.add(str(latest))
     print(' '.join(results))
 
+
 if __name__ == '__main__':
     main()

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"',