Skip to content

Commit ead0bb9

Browse files
authored
Merge pull request #2348 from docker/4.0.1-release
4.0.1 release
2 parents 5d42ab8 + 307e2b3 commit ead0bb9

File tree

5 files changed

+30
-6
lines changed

5 files changed

+30
-6
lines changed

.readthedocs.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
3+
sphinx:
4+
configuration: docs/conf.py
5+
6+
python:
7+
version: 3.5
8+
install:
9+
- requirements: docs-requirements.txt
10+
- requirements: requirements.txt

docker/credentials/store.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import errno
12
import json
2-
import os
33
import subprocess
44

55
import six
@@ -84,15 +84,15 @@ def _execute(self, subcmd, data_input):
8484
[self.exe, subcmd], stdin=subprocess.PIPE,
8585
stdout=subprocess.PIPE, env=env,
8686
)
87-
output, err = process.communicate(data_input)
87+
output, _ = process.communicate(data_input)
8888
if process.returncode != 0:
8989
raise subprocess.CalledProcessError(
9090
returncode=process.returncode, cmd='', output=output
9191
)
9292
except subprocess.CalledProcessError as e:
9393
raise errors.process_store_error(e, self.program)
9494
except OSError as e:
95-
if e.errno == os.errno.ENOENT:
95+
if e.errno == errno.ENOENT:
9696
raise errors.StoreError(
9797
'{} not installed or not available in PATH'.format(
9898
self.program

docker/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version = "4.0.0"
1+
version = "4.0.1"
22
version_info = tuple([int(d) for d in version.split("-")[0].split(".")])

docs/change-log.md

+14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
Change log
22
==========
33

4+
4.0.1
5+
-----
6+
7+
[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/60?closed=1)
8+
9+
### Bugfixes
10+
11+
- Fixed an obsolete import in the `credentials` subpackage that caused import errors in
12+
Python 3.7
13+
14+
### Miscellaneous
15+
16+
- Docs building has been repaired
17+
418
4.0.0
519
-----
620

docs/user_guides/swarm_services.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
77
Starting with Engine version 1.12 (API 1.24), it is possible to manage services
88
using the Docker Engine API. Note that the engine needs to be part of a
9-
[Swarm cluster](../swarm.rst) before you can use the service-related methods.
9+
[Swarm cluster](../swarm.html) before you can use the service-related methods.
1010

1111
## Creating a service
1212

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

6767
```python
6868
client.remove_service('my_service_name')
69-
```
69+
```

0 commit comments

Comments
 (0)