From 7167189486cb9bbb8148b80ee6fa5e53e655fca4 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Fri, 9 Sep 2016 16:55:10 -0700 Subject: [PATCH 1/2] Bump version + Update Changelog Signed-off-by: Joffrey F --- docker/version.py | 2 +- docs/change_log.md | 11 +++++++++++ setup.cfg | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docker/version.py b/docker/version.py index 40accf1388..1bc9811310 100644 --- a/docker/version.py +++ b/docker/version.py @@ -1,2 +1,2 @@ -version = "1.10.0" +version = "1.10.1" version_info = tuple([int(d) for d in version.split("-")[0].split(".")]) diff --git a/docs/change_log.md b/docs/change_log.md index d37e48fd91..0ef2787e72 100644 --- a/docs/change_log.md +++ b/docs/change_log.md @@ -1,6 +1,17 @@ Change Log ========== +1.10.1 +------ + +[List of PRs / issues for this release](https://github.com/docker/docker-py/issues?q=milestone%3A1.10.0+is%3Aclosed) + +### Bugfixes + +* The docker.utils.types module was removed in favor of docker.types, but some + applications imported it explicitly. It has been re-added with an import + warning advising to use the new module path. + 1.10.0 ------ diff --git a/setup.cfg b/setup.cfg index ad388d24d3..00b8f37d4a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,4 +2,4 @@ universal = 1 [metadata] -description_file = README.md +description_file = README.rst From 8abb8eecfca921977042a2c812b85f0da909ca2e Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Fri, 9 Sep 2016 16:44:55 -0700 Subject: [PATCH 2/2] Re-add docker.utils.types module for backwards compatibility Signed-off-by: Joffrey F --- docker/utils/types.py | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 docker/utils/types.py diff --git a/docker/utils/types.py b/docker/utils/types.py new file mode 100644 index 0000000000..8098c470f8 --- /dev/null +++ b/docker/utils/types.py @@ -0,0 +1,7 @@ +# Compatibility module. See https://github.com/docker/docker-py/issues/1196 + +import warnings + +from ..types import Ulimit, LogConfig # flake8: noqa + +warnings.warn('docker.utils.types is now docker.types', ImportWarning)