diff options
author | Joffrey F <f.joffrey@gmail.com> | 2015-02-16 10:53:06 -0800 |
---|---|---|
committer | Joffrey F <f.joffrey@gmail.com> | 2015-02-16 10:53:06 -0800 |
commit | 35b694d6781cd752a4a2c00eee06badbc23b3846 (patch) | |
tree | 8a4ca1ad287b7a32dc625e63e54e74ed7f5fa5f3 | |
parent | ec642f37103552835b0e5fd12e7ca81b75d6ccf5 (diff) | |
parent | 0f1bd817ac8947b3089a40f5b5a50968c05d87de (diff) | |
download | docker-py-35b694d6781cd752a4a2c00eee06badbc23b3846.tar.gz |
Merge pull request #493 from docker/1.0.0-release
1.0.0 release
-rw-r--r-- | docker/client.py | 11 | ||||
-rw-r--r-- | docker/version.py | 2 | ||||
-rw-r--r-- | docs/change_log.md | 29 | ||||
-rw-r--r-- | tests/fake_stat.py | 278 |
4 files changed, 163 insertions, 157 deletions
diff --git a/docker/client.py b/docker/client.py index 839b04d..f920229 100644 --- a/docker/client.py +++ b/docker/client.py @@ -17,7 +17,6 @@ import os import re import shlex import struct -import warnings from datetime import datetime import requests @@ -140,12 +139,6 @@ class Client(requests.Session): def _create_websocket_connection(self, url): return websocket.create_connection(url) - def _warn_deprecated(self, arg_name, version): - warning_message = ( - '{0!r} is deprecated for API version >= {1}' - ).format(arg_name, version) - warnings.warn(warning_message, DeprecationWarning) - def _get_raw_response_socket(self, response): self._raise_for_status(response) if six.PY3: @@ -221,6 +214,10 @@ class Client(requests.Session): break yield data + @property + def api_version(self): + return self._version + def attach(self, container, stdout=True, stderr=True, stream=False, logs=False): if isinstance(container, dict): diff --git a/docker/version.py b/docker/version.py index 3e94292..11a716e 100644 --- a/docker/version.py +++ b/docker/version.py @@ -1 +1 @@ -version = "0.7.3-dev" +version = "1.0.0" diff --git a/docs/change_log.md b/docs/change_log.md index 346b5a2..963878f 100644 --- a/docs/change_log.md +++ b/docs/change_log.md @@ -1,6 +1,35 @@ Change Log ========== +1.0.0 +----- + +### Features + +* Added new `Client.rename` method (`docker rename`) +* Added now `Client.stats` method (`docker stats`) +* Added `read_only` param support to `utils.create_host_config` and + `Client.start` (`docker run --read-only`) +* Added `pid_mode` param support to `utils.create_host_config` and + `Client.start` (`docker run --pid='host'`) +* Added `since`, `until` and `filters` params to `Client.events`. +* Added `decode` parameter to `Client.stats` and `Client.events` to decode + JSON objects on the fly (False by default). + +### Bugfixes + +* Fixed a bug that caused `Client.build` to crash when the provided source was + a remote source. + +### Miscellaneous + +* Default API version has been bumped to 1.17 (Docker Engine 1.5.0) +* `Client.timeout` is now a public attribute, and users are encouraged to use it + when request timeouts need to be changed at runtime. +* Added `Client.api_version` as a read-only property. +* The `memswap_limit` argument in `Client.create_container` now accepts string + type values similar to `mem_limit` ('6g', '120000k', etc.) +* Improved documentation 0.7.2 ----- diff --git a/tests/fake_stat.py b/tests/fake_stat.py index 470e014..a7f1029 100644 --- a/tests/fake_stat.py +++ b/tests/fake_stat.py @@ -1,153 +1,133 @@ OBJ = { - "read": "2015-02-11T19:20:46.667237763+02:00", - "network": { - "rx_bytes": 567224, - "rx_packets": 3773, - "rx_errors": 0, - "rx_dropped": 0, - "tx_bytes": 1176, - "tx_packets": 13, - "tx_errors": 0, - "tx_dropped": 0 - }, - "cpu_stats": { - "cpu_usage": { - "total_usage": 157260874053, - "percpu_usage": [ - 52196306950, - 24118413549, - 53292684398, - 27653469156 - ], - "usage_in_kernelmode": 37140000000, - "usage_in_usermode": 62140000000 + "read": "2015-02-11T19:20:46.667237763+02:00", + "network": { + "rx_bytes": 567224, + "rx_packets": 3773, + "rx_errors": 0, + "rx_dropped": 0, + "tx_bytes": 1176, + "tx_packets": 13, + "tx_errors": 0, + "tx_dropped": 0 }, - "system_cpu_usage": 3.0881377e+14, - "throttling_data": { - "periods": 0, - "throttled_periods": 0, - "throttled_time": 0 - } - }, - "memory_stats": { - "usage": 179314688, - "max_usage": 258166784, - "stats": { - "active_anon": 90804224, - "active_file": 2195456, - "cache": 3096576, - "hierarchical_memory_limit": 1.844674407371e+19, - "inactive_anon": 85516288, - "inactive_file": 798720, - "mapped_file": 2646016, - "pgfault": 101034, - "pgmajfault": 1207, - "pgpgin": 115814, - "pgpgout": 75613, - "rss": 176218112, - "rss_huge": 12582912, - "total_active_anon": 90804224, - "total_active_file": 2195456, - "total_cache": 3096576, - "total_inactive_anon": 85516288, - "total_inactive_file": 798720, - "total_mapped_file": 2646016, - "total_pgfault": 101034, - "total_pgmajfault": 1207, - "total_pgpgin": 115814, - "total_pgpgout": 75613, - "total_rss": 176218112, - "total_rss_huge": 12582912, - "total_unevictable": 0, - "total_writeback": 0, - "unevictable": 0, - "writeback": 0 + "cpu_stats": { + "cpu_usage": { + "total_usage": 157260874053, + "percpu_usage": [ + 52196306950, + 24118413549, + 53292684398, + 27653469156 + ], + "usage_in_kernelmode": 37140000000, + "usage_in_usermode": 62140000000 + }, + "system_cpu_usage": 3.0881377e+14, + "throttling_data": { + "periods": 0, + "throttled_periods": 0, + "throttled_time": 0 + } + }, + "memory_stats": { + "usage": 179314688, + "max_usage": 258166784, + "stats": { + "active_anon": 90804224, + "active_file": 2195456, + "cache": 3096576, + "hierarchical_memory_limit": 1.844674407371e+19, + "inactive_anon": 85516288, + "inactive_file": 798720, + "mapped_file": 2646016, + "pgfault": 101034, + "pgmajfault": 1207, + "pgpgin": 115814, + "pgpgout": 75613, + "rss": 176218112, + "rss_huge": 12582912, + "total_active_anon": 90804224, + "total_active_file": 2195456, + "total_cache": 3096576, + "total_inactive_anon": 85516288, + "total_inactive_file": 798720, + "total_mapped_file": 2646016, + "total_pgfault": 101034, + "total_pgmajfault": 1207, + "total_pgpgin": 115814, + "total_pgpgout": 75613, + "total_rss": 176218112, + "total_rss_huge": 12582912, + "total_unevictable": 0, + "total_writeback": 0, + "unevictable": 0, + "writeback": 0 + }, + "failcnt": 0, + "limit": 8039038976 }, - "failcnt": 0, - "limit": 8039038976 - }, - "blkio_stats": { - "io_service_bytes_recursive": [ - { - "major": 8, - "minor": 0, - "op": "Read", - "value": 72843264 - }, - { - "major": 8, - "minor": 0, - "op": "Write", - "value": 4096 - }, - { - "major": 8, - "minor": 0, - "op": "Sync", - "value": 4096 - }, - { - "major": 8, - "minor": 0, - "op": "Async", - "value": 72843264 - }, - { - "major": 8, - "minor": 0, - "op": "Total", - "value": 72847360 - } - ], - "io_serviced_recursive": [ - { - "major": 8, - "minor": 0, - "op": "Read", - "value": 10581 - }, - { - "major": 8, - "minor": 0, - "op": "Write", - "value": 1 - }, - { - "major": 8, - "minor": 0, - "op": "Sync", - "value": 1 - }, - { - "major": 8, - "minor": 0, - "op": "Async", - "value": 10581 - }, - { - "major": 8, - "minor": 0, - "op": "Total", - "value": 10582 - } - ], - "io_queue_recursive": [ - - ], - "io_service_time_recursive": [ - - ], - "io_wait_time_recursive": [ - - ], - "io_merged_recursive": [ - - ], - "io_time_recursive": [ - - ], - "sectors_recursive": [ - - ] - } + "blkio_stats": { + "io_service_bytes_recursive": [ + { + "major": 8, + "minor": 0, + "op": "Read", + "value": 72843264 + }, { + "major": 8, + "minor": 0, + "op": "Write", + "value": 4096 + }, { + "major": 8, + "minor": 0, + "op": "Sync", + "value": 4096 + }, { + "major": 8, + "minor": 0, + "op": "Async", + "value": 72843264 + }, { + "major": 8, + "minor": 0, + "op": "Total", + "value": 72847360 + } + ], + "io_serviced_recursive": [ + { + "major": 8, + "minor": 0, + "op": "Read", + "value": 10581 + }, { + "major": 8, + "minor": 0, + "op": "Write", + "value": 1 + }, { + "major": 8, + "minor": 0, + "op": "Sync", + "value": 1 + }, { + "major": 8, + "minor": 0, + "op": "Async", + "value": 10581 + }, { + "major": 8, + "minor": 0, + "op": "Total", + "value": 10582 + } + ], + "io_queue_recursive": [], + "io_service_time_recursive": [], + "io_wait_time_recursive": [], + "io_merged_recursive": [], + "io_time_recursive": [], + "sectors_recursive": [] + } } |