Skip to content

Commit 80e862a

Browse files
committed
Merge branch 'release'
2 parents 042a0e5 + d74bfa6 commit 80e862a

File tree

2 files changed

+39
-2
lines changed

2 files changed

+39
-2
lines changed

docker/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version = "3.6.0-dev"
1+
version = "3.6.0"
22
version_info = tuple([int(d) for d in version.split("-")[0].split(".")])

docs/change-log.md

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,47 @@
11
Change log
22
==========
33

4+
3.6.0
5+
-----
6+
7+
[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone=55?closed=1)
8+
9+
### Features
10+
11+
* Added support for connecting to the Docker Engine over SSH. Additional
12+
dependencies for this feature can be installed with
13+
`pip install "docker[ssh]"`
14+
* Added support for the `named` parameter in `Image.save`, which may be
15+
used to ensure the resulting tarball retains the image's name on save.
16+
17+
### Bugfixes
18+
19+
* Fixed a bug where builds on Windows with a context path using the `\\?\`
20+
prefix would fail with some relative Dockerfile paths.
21+
* Fixed an issue where pulls made with the `DockerClient` would fail when
22+
setting the `stream` parameter to `True`.
23+
24+
### Miscellaneous
25+
26+
* The minimum requirement for the `requests` dependency has been bumped
27+
to 2.20.0
28+
29+
3.5.1
30+
-----
31+
32+
[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/54?closed=1)
33+
34+
### Miscellaneous
35+
36+
* Bumped version of `pyOpenSSL` in `requirements.txt` and `setup.py` to prevent
37+
installation of a vulnerable version
38+
39+
* Docs fixes
40+
441
3.5.0
542
-----
643

7-
[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone=53?closed=1)
44+
[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/53?closed=1)
845

946
### Deprecation warning
1047

0 commit comments

Comments
 (0)