diff options
| author | Joffrey F <joffrey@docker.com> | 2019-05-01 20:00:51 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2019-05-01 20:01:25 -0700 |
| commit | f59e317dba636a6922a33c7740912c9bda32be86 (patch) | |
| tree | 5881ace682358eb6aee00c758bbee670d96d4287 | |
| parent | 75e0ad017c5b784b1329d02bca2e4eee6b4374d9 (diff) | |
| parent | a4c251d230861358c3ee848de6c0852bd96b048f (diff) | |
| download | docker-py-update_master_release_notes.tar.gz | |
Merge branch 'release'update_master_release_notes
Signed-off-by: Joffrey F <joffrey@docker.com>
| -rw-r--r-- | docs/change-log.md | 11 | ||||
| -rwxr-xr-x | scripts/versions.py | 1 | ||||
| -rw-r--r-- | tests/integration/api_container_test.py | 3 |
3 files changed, 15 insertions, 0 deletions
diff --git a/docs/change-log.md b/docs/change-log.md index 9edfee2..d7c3361 100644 --- a/docs/change-log.md +++ b/docs/change-log.md @@ -1,6 +1,17 @@ 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 ----- diff --git a/scripts/versions.py b/scripts/versions.py index 4bdcb74..1a5adcb 100755 --- a/scripts/versions.py +++ b/scripts/versions.py @@ -72,5 +72,6 @@ def main(): results.add(str(latest)) print(' '.join(results)) + if __name__ == '__main__': main() diff --git a/tests/integration/api_container_test.py b/tests/integration/api_container_test.py index 1190d91..26245c1 100644 --- a/tests/integration/api_container_test.py +++ b/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"', |