From 720401c3b2dcc63fe1454b35c964a348b1b779b6 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Tue, 29 Sep 2015 14:25:20 -0400 Subject: [PATCH] Upgrade requirements to fix #17 --- docker_custodian/__about__.py | 2 +- requirements.txt | 6 +++--- tests/docker_autostop_test.py | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docker_custodian/__about__.py b/docker_custodian/__about__.py index f611224..ed4bf33 100644 --- a/docker_custodian/__about__.py +++ b/docker_custodian/__about__.py @@ -1,4 +1,4 @@ # -*- coding: utf8 -*- -__version_info__ = (0, 5, 0) +__version_info__ = (0, 5, 1) __version__ = '%d.%d.%d' % __version_info__ diff --git a/requirements.txt b/requirements.txt index 8c90b77..91ae5f0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ argparse==1.3.0 backports.ssl-match-hostname==3.4.0.2 -docker-py==0.6.0 +docker-py==1.4.0 future==0.14.3 python-dateutil==2.4.0 pytimeparse==1.1.2 -requests==2.5.1 +requests==2.7.0 six==1.9.0 -websocket-client==0.23.0 +websocket-client==0.32.0 diff --git a/tests/docker_autostop_test.py b/tests/docker_autostop_test.py index 83b428a..4087266 100644 --- a/tests/docker_autostop_test.py +++ b/tests/docker_autostop_test.py @@ -53,7 +53,9 @@ def test_has_been_running_since_false(container, earlier_time): autospec=True) @mock.patch('docker_custodian.docker_autostop.get_opts', autospec=True) -def test_main(mock_get_opts, mock_stop_containers, mock_build_matcher): +@mock.patch('docker_custodian.docker_autostop.docker', autospec=True) +def test_main(mock_docker, mock_get_opts, mock_stop_containers, mock_build_matcher): + mock_get_opts.return_value.timeout = 30 main() mock_get_opts.assert_called_once_with() mock_build_matcher.assert_called_once_with(