From 21cdd3f6d7957ea7c3c5e6c6404d7b486e9546c8 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Tue, 21 Mar 2017 12:39:32 -0700 Subject: [PATCH] Bump docker SDK dependency Update invalid ports test Signed-off-by: Joffrey F --- requirements.txt | 2 +- setup.py | 2 +- tests/unit/config/config_test.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 53b9294ce..f8061af83 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ PyYAML==3.11 backports.ssl-match-hostname==3.5.0.1; python_version < '3' cached-property==1.2.0 colorama==0.3.7 -docker==2.1.0 +docker==2.2.1 dockerpty==0.4.1 docopt==0.6.1 enum34==1.0.4; python_version < '3.4' diff --git a/setup.py b/setup.py index 13fe59b22..19a0d4aa0 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ install_requires = [ 'requests >= 2.6.1, != 2.11.0, < 2.12', 'texttable >= 0.8.1, < 0.9', 'websocket-client >= 0.32.0, < 1.0', - 'docker >= 2.1.0, < 3.0', + 'docker >= 2.2.1, < 3.0', 'dockerpty >= 0.4.1, < 0.5', 'six >= 1.3.0, < 2', 'jsonschema >= 2.5.1, < 3', diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py index 88a475801..b7e4cc9bf 100644 --- a/tests/unit/config/config_test.py +++ b/tests/unit/config/config_test.py @@ -2300,7 +2300,8 @@ class PortsTest(unittest.TestCase): ] INVALID_PORT_MAPPINGS = [ - ["8000-8001:8000"], + ["8000-8004:8000-8002"], + ["4242:4242-4244"], ] VALID_SINGLE_PORTS = [