From 80f68c81cd86447d3a9ed01049f353c32bb6adb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Batuhan=20Ta=C5=9Fkaya?= Date: Thu, 9 May 2019 20:29:11 +0300 Subject: [PATCH 1/6] reference swarm page correctly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Batuhan Taşkaya --- docs/user_guides/swarm_services.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/user_guides/swarm_services.md b/docs/user_guides/swarm_services.md index 369fbed0..5c3a80d2 100644 --- a/docs/user_guides/swarm_services.md +++ b/docs/user_guides/swarm_services.md @@ -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 @@ -66,4 +66,4 @@ Either the service name or service ID can be used as argument. ```python client.remove_service('my_service_name') -``` \ No newline at end of file +``` From 4a8a86eed41926781a0409b743c59f1fc675a497 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Sat, 18 May 2019 18:57:30 -0700 Subject: [PATCH 2/6] Add readthedocs config Signed-off-by: Joffrey F --- .readthedocs.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .readthedocs.yml diff --git a/.readthedocs.yml b/.readthedocs.yml new file mode 100644 index 00000000..7679f80a --- /dev/null +++ b/.readthedocs.yml @@ -0,0 +1,10 @@ +version: 2 + +sphinx: + configuration: docs/conf.py + +python: + version: 3.5 + install: + - requirements: docs-requirements.txt + - requirements: requirements.txt From df182fd42d0919fe5812ffcce15c54499c594c44 Mon Sep 17 00:00:00 2001 From: Simon Gurcke Date: Sun, 19 May 2019 12:20:12 +1000 Subject: [PATCH 3/6] Change os.errno to errno for py3.7 compatibility Signed-off-by: Simon Gurcke --- docker/credentials/store.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/credentials/store.py b/docker/credentials/store.py index 3f51e4a7..00178889 100644 --- a/docker/credentials/store.py +++ b/docker/credentials/store.py @@ -1,5 +1,5 @@ +import errno import json -import os import subprocess import six @@ -84,7 +84,7 @@ class Store(object): [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 @@ -92,7 +92,7 @@ class Store(object): 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 From fc0285c09b4285129a5273cc01356e6178f7fbff Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Sat, 18 May 2019 19:28:39 -0700 Subject: [PATCH 4/6] Version bump Signed-off-by: Joffrey F --- docker/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/version.py b/docker/version.py index 68d64c8a..21249253 100644 --- a/docker/version.py +++ b/docker/version.py @@ -1,2 +1,2 @@ -version = "4.0.0" +version = "4.1.0-dev" version_info = tuple([int(d) for d in version.split("-")[0].split(".")]) From 4d08f2c33d0cd15413c5dd0fd5a16e22436b3e81 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Sat, 18 May 2019 19:51:14 -0700 Subject: [PATCH 5/6] Bump 4.0.1 Signed-off-by: Joffrey F --- docker/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/version.py b/docker/version.py index 21249253..24731263 100644 --- a/docker/version.py +++ b/docker/version.py @@ -1,2 +1,2 @@ -version = "4.1.0-dev" +version = "4.0.1" version_info = tuple([int(d) for d in version.split("-")[0].split(".")]) From 307e2b3eda7198cbc991a8fbc2bce25b08e9eb9f Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Sat, 18 May 2019 19:53:53 -0700 Subject: [PATCH 6/6] Changelog 4.0.1 Signed-off-by: Joffrey F --- docs/change-log.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/change-log.md b/docs/change-log.md index 53e9f207..4032249b 100644 --- a/docs/change-log.md +++ b/docs/change-log.md @@ -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 -----