chg: dev: Upgrade docker library version

HPENetworking · Nov 15, 2019 · 228606c · 228606c
1 parent 57b1086
commit 228606c
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 20 deletions.
diff --git a/doc/conf.py b/doc/conf.py
@@ -311,6 +311,7 @@
 def setup(app):
     app.add_stylesheet('styles/custom.css')
 
+
 # autoapi configuration
 autoapi_modules = {
     'topology_docker': None

diff --git a/lib/topology_docker/__init__.py b/lib/topology_docker/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2015-2016 Hewlett Packard Enterprise Development LP
+# Copyright (C) 2015-2018 Hewlett Packard Enterprise Development LP
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,4 +24,4 @@
 
 __author__ = 'Hewlett Packard Enterprise Development LP'
 __email__ = '[email protected]'
-__version__ = '1.6.0'
+__version__ = '1.7.0'
diff --git a/lib/topology_docker/node.py b/lib/topology_docker/node.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2015-2016 Hewlett Packard Enterprise Development LP
+# Copyright (C) 2015-2018 Hewlett Packard Enterprise Development LP
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
 from subprocess import check_output
 from abc import ABCMeta, abstractmethod
 
-from docker import Client
+from docker import APIClient
 from six import add_metaclass
 
 from topology.platforms.node import CommonNode
@@ -125,7 +125,7 @@ def __init__(
         self._command = command
         self._hostname = hostname
         self._environment = environment
-        self._client = Client(version='auto')
+        self._client = APIClient(version='auto')
 
         self._container_name = '{identifier}_{pid}_{timestamp}'.format(
             identifier=identifier, pid=getpid(),

diff --git a/lib/topology_docker/platform.py b/lib/topology_docker/platform.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2015-2016 Hewlett Packard Enterprise Development LP
+# Copyright (C) 2015-2018 Hewlett Packard Enterprise Development LP
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 import logging
 from traceback import format_exc
 from collections import OrderedDict
-from docker import Client
+from docker import APIClient
 
 from topology.platforms.utils import NodeLoader
 from topology.platforms.platform import BasePlatform
@@ -293,14 +293,14 @@ def destroy(self):
         for enode in self.nmlnode_node_map.values():
             try:
                 enode.stop()
-            except:
+            except Exception:
                 log.error(format_exc())
 
         # Remove the linked netns
         for enode in self.nmlnode_node_map.values():
             try:
                 privileged_cmd('rm /var/run/netns/{pid}', pid=enode._pid)
-            except:
+            except Exception:
                 log.error(format_exc())
 
         # Save the names of all docker-managed networks
@@ -321,11 +321,11 @@ def destroy(self):
 
                         networks_to_remove.add(netname)
 
-            except:
+            except Exception:
                 log.error(format_exc())
 
         # Remove all docker-managed networks
-        dockerclient = Client(version='auto')
+        dockerclient = APIClient(version='auto')
         for netname in networks_to_remove:
             dockerclient.remove_network(net_id=netname)
 

diff --git a/lib/topology_docker/utils.py b/lib/topology_docker/utils.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2015-2016 Hewlett Packard Enterprise Development LP
+# Copyright (C) 2015-2018 Hewlett Packard Enterprise Development LP
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -160,5 +160,11 @@ def get_iface_name(enode, netname):
 
     return iface
 
-__all__ = ['ensure_dir', 'tmp_iface', 'cmd_prefix', 'privileged_cmd',
-           'get_iface_name']
+
+__all__ = [
+    'ensure_dir',
+    'tmp_iface',
+    'cmd_prefix',
+    'privileged_cmd',
+    'get_iface_name'
+]
diff --git a/requirements.dev.txt b/requirements.dev.txt
@@ -6,9 +6,8 @@ flake8
 pep8-naming
 
 # Pytest framework
-pytest===2.8.4
+pytest
 pytest-cov
-pytest-logging
 
 # Documentation
 sphinx

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
 six
-docker-py==1.10.4
+docker
 topology>=1.8.0
+pyparsing==2.2.2
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, coverage, doc
+envlist = py27, py3, coverage, doc
 
 [testenv]
 passenv = http_proxy https_proxy
@@ -15,7 +15,7 @@ commands =
         {envsitepackagesdir}/topology_docker
 
 [testenv:coverage]
-basepython = python3.4
+basepython = python3
 commands =
     py.test \
         --junitxml=tests.xml \
@@ -28,7 +28,7 @@ commands =
         {envsitepackagesdir}/topology_docker
 
 [testenv:doc]
-basepython = python3.4
+basepython = python3
 whitelist_externals =
     dot
 commands =