Skip to content

1.10.6 release #1286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 2, 2016
Merged

1.10.6 release #1286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9576c1
Fix NpipeSocket.settimeout to match expected behavior
shin- Nov 2, 2016
80ad738
Bumped version to 1.10.6 - Updated changelog
shin- Nov 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions docker/transport/npipesocket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,13 +169,16 @@ def setblocking(self, flag):

def settimeout(self, value):
if value is None:
self._timeout = win32pipe.NMPWAIT_NOWAIT
# Blocking mode
self._timeout = win32pipe.NMPWAIT_WAIT_FOREVER
elif not isinstance(value, (float, int)) or value < 0:
raise ValueError('Timeout value out of range')
elif value == 0:
self._timeout = win32pipe.NMPWAIT_USE_DEFAULT_WAIT
# Non-blocking mode
self._timeout = win32pipe.NMPWAIT_NO_WAIT
else:
self._timeout = value
# Timeout mode - Value converted to milliseconds
self._timeout = value * 1000

def gettimeout(self):
return self._timeout
Expand Down
2 changes: 1 addition & 1 deletion docker/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = "1.10.5"
version = "1.10.6"
version_info = tuple([int(d) for d in version.split("-")[0].split(".")])
13 changes: 12 additions & 1 deletion docs/change_log.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
Change Log
==========

1.10.6
------

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

### Bugfixes

* Fixed an issue where setting a `NpipeSocket` instance to blocking mode would
put it in non-blocking mode and vice-versa.


1.10.5
------

[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/24?closed=1)
[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/25?closed=1)

### Bugfixes

Expand Down