diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2017-06-28 13:41:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-28 13:41:57 -0700 |
| commit | eb0d80646aab85b2ed555a54c2d3dffe2c7be150 (patch) | |
| tree | f187a1a26fce74d20b1fe5cbc80c7d8412efedb1 | |
| parent | 65e01f24e4d0278c976ff7f88b5bbf13bcd6e1ec (diff) | |
| parent | 43f87e9f63a99c56f05afbf28e3a973151cacee5 (diff) | |
| download | docker-py-2.4.2.tar.gz | |
Merge pull request #1672 from docker/2.4.2-release2.4.2
2.4.2 release
| -rw-r--r-- | docker/utils/ports.py | 5 | ||||
| -rw-r--r-- | docker/version.py | 2 | ||||
| -rw-r--r-- | docs/change-log.md | 4 |
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 |