Skip to content

Commit

Permalink
Merge pull request docker#2348 from docker/4.0.1-release
Browse files Browse the repository at this point in the history
4.0.1 release
  • Loading branch information
shin- authored May 19, 2019
2 parents 5d42ab8 + 307e2b3 commit ead0bb9
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 6 deletions.
10 changes: 10 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2

sphinx:
configuration: docs/conf.py

python:
version: 3.5
install:
- requirements: docs-requirements.txt
- requirements: requirements.txt
6 changes: 3 additions & 3 deletions docker/credentials/store.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import errno
import json
import os
import subprocess

import six
Expand Down Expand Up @@ -84,15 +84,15 @@ def _execute(self, subcmd, data_input):
[self.exe, subcmd], stdin=subprocess.PIPE,
stdout=subprocess.PIPE, env=env,
)
output, err = process.communicate(data_input)
output, _ = process.communicate(data_input)
if process.returncode != 0:
raise subprocess.CalledProcessError(
returncode=process.returncode, cmd='', output=output
)
except subprocess.CalledProcessError as e:
raise errors.process_store_error(e, self.program)
except OSError as e:
if e.errno == os.errno.ENOENT:
if e.errno == errno.ENOENT:
raise errors.StoreError(
'{} not installed or not available in PATH'.format(
self.program
Expand Down
2 changes: 1 addition & 1 deletion docker/version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = "4.0.0"
version = "4.0.1"
version_info = tuple([int(d) for d in version.split("-")[0].split(".")])
14 changes: 14 additions & 0 deletions docs/change-log.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
Change log
==========

4.0.1
-----

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

### Bugfixes

- Fixed an obsolete import in the `credentials` subpackage that caused import errors in
Python 3.7

### Miscellaneous

- Docs building has been repaired

4.0.0
-----

Expand Down
4 changes: 2 additions & 2 deletions docs/user_guides/swarm_services.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Starting with Engine version 1.12 (API 1.24), it is possible to manage services
using the Docker Engine API. Note that the engine needs to be part of a
[Swarm cluster](../swarm.rst) before you can use the service-related methods.
[Swarm cluster](../swarm.html) before you can use the service-related methods.

## Creating a service

Expand Down Expand Up @@ -66,4 +66,4 @@ Either the service name or service ID can be used as argument.

```python
client.remove_service('my_service_name')
```
```

0 comments on commit ead0bb9

Please sign in to comment.