summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docker/utils/ports.py5
-rw-r--r--docker/version.py2
-rw-r--r--docs/change-log.md4
3 files changed, 8 insertions, 3 deletions
diff --git a/docker/utils/ports.py b/docker/utils/ports.py
index 8f713c7..bf7d697 100644
--- a/docker/utils/ports.py
+++ b/docker/utils/ports.py
@@ -54,6 +54,11 @@ def port_range(start, end, proto, randomly_available_port=False):
def split_port(port):
+ if hasattr(port, 'legacy_repr'):
+ # This is the worst hack, but it prevents a bug in Compose 1.14.0
+ # https://github.com/docker/docker-py/issues/1668
+ # TODO: remove once fixed in Compose stable
+ port = port.legacy_repr()
port = str(port)
match = PORT_SPEC.match(port)
if match is None:
diff --git a/docker/version.py b/docker/version.py
index 7953c90..af1bd5b 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1,2 +1,2 @@
-version = "2.4.1"
+version = "2.4.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 4ccb617..7099d79 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -1,10 +1,10 @@
Change log
==========
-2.4.1
+2.4.2
-----
-[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/35?closed=1)
+[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/36?closed=1)
### Bugfixes