summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2016-09-11 19:01:39 -0700
committerJoffrey F <joffrey@docker.com>2016-09-11 19:01:39 -0700
commit2ad403c78b05ecae9f518282dc87fd4440f23cf8 (patch)
treeb37f21c058f5d6a6a4ec0f907e08fbad03f9284a
parentc2b4c8e2e25e36dc4bb9ae4cfab129b667381217 (diff)
downloaddocker-py-2ad403c78b05ecae9f518282dc87fd4440f23cf8.tar.gz
Bump docker-pycreds dependency ; bump patch number
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r--docker/version.py2
-rw-r--r--docs/change_log.md11
-rw-r--r--requirements.txt2
-rw-r--r--setup.py2
4 files changed, 14 insertions, 3 deletions
diff --git a/docker/version.py b/docker/version.py
index 1bc9811..730a834 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1,2 +1,2 @@
-version = "1.10.1"
+version = "1.10.2"
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 0ef2787..237770f 100644
--- a/docs/change_log.md
+++ b/docs/change_log.md
@@ -1,6 +1,17 @@
Change Log
==========
+1.10.2
+------
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/issues?q=milestone%3A1.10.0+is%3Aclosed)
+
+### Bugfixes
+
+* Updated the docker-pycreds dependency as it was causing issues for some
+ users with dependency resolution in applications using docker-py.
+
+
1.10.1
------
diff --git a/requirements.txt b/requirements.txt
index 4c0d5c2..1e52846 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,4 +3,4 @@ six>=1.4.0
websocket-client==0.32.0
backports.ssl_match_hostname>=3.5 ; python_version < '3.5'
ipaddress==1.0.16 ; python_version < '3.3'
-docker-pycreds==0.2.0 \ No newline at end of file
+docker-pycreds==0.2.1 \ No newline at end of file
diff --git a/setup.py b/setup.py
index 1afd873..9233ac2 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ requirements = [
'requests >= 2.5.2, < 2.11',
'six >= 1.4.0',
'websocket-client >= 0.32.0',
- 'docker-pycreds >= 0.2.0'
+ 'docker-pycreds >= 0.2.1'
]
if sys.platform == 'win32':