Merge pull request #645 from docker/update-websocket-client-dep

Update websocket client dependency

Author: aanand

docker/client.py

@@ -23,6 +23,8 @@
 import requests
 import requests.exceptions
 import six
+import websocket
+
 
 from . import constants
 from . import errors
@@ -33,10 +35,6 @@
 from .tls import TLSConfig
 
 
-if not six.PY3:
-    import websocket
-
-
 class Client(requests.Session):
     def __init__(self, base_url=None, version=None,
                  timeout=constants.DEFAULT_TIMEOUT_SECONDS, tls=False):
@@ -154,9 +152,6 @@ def _attach_params(self, override=None):
 
     @check_resource
     def _attach_websocket(self, container, params=None):
-        if six.PY3:
-            raise NotImplementedError("This method is not currently supported "
-                                      "under python 3")
         url = self._url("/containers/{0}/attach/ws".format(container))
         req = requests.Request("POST", url, params=self._attach_params(params))
         full_url = req.prepare().url

requirements.txt

@@ -1,3 +1,3 @@
 requests==2.5.3
 six>=1.3.0
-websocket-client==0.11.0
+websocket-client==0.32.0

requirements3.txt

@@ -12,7 +12,7 @@
 ]
 
 if sys.version_info[0] < 3:
-    requirements.append('websocket-client >= 0.11.0')
+    requirements.append('websocket-client >= 0.32.0')
 
 exec(open('docker/version.py').read())
 

setup.py

@@ -2,24 +2,6 @@
 envlist = py26, py27, py32, py33, py34, flake8
 skipsdist=True
 
-[testenv:py26]
-usedevelop=True
-commands =
-    {envbindir}/coverage run -p tests/test.py
-    {envbindir}/coverage run -p tests/utils_test.py
-deps =
-    -r{toxinidir}/requirements.txt
-    -r{toxinidir}/test-requirements.txt
-
-[testenv:py27]
-usedevelop=True
-commands =
-    {envbindir}/coverage run -p tests/test.py
-    {envbindir}/coverage run -p tests/utils_test.py
-deps =
-    -r{toxinidir}/requirements.txt
-    -r{toxinidir}/test-requirements.txt
-
 [testenv]
 usedevelop=True
 commands =
@@ -29,8 +11,8 @@ commands =
     {envbindir}/coverage report
     {envbindir}/coverage html
 deps =
-    -r{toxinidir}/requirements3.txt
     -r{toxinidir}/test-requirements.txt
+    -r{toxinidir}/requirements.txt
 
 [testenv:flake8]
 commands = flake8 docker tests