Merge branch 'master' into patch-1

Author: kragniz

etcd3/client.py

@@ -170,17 +170,15 @@ def __init__(self, host='localhost', port=2379,
 
     def close(self):
         """Call the GRPC channel close semantics."""
-        self.channel.close()
+        if hasattr(self, 'channel'):
+            self.channel.close()
 
     def __enter__(self):
         return self
 
     def __exit__(self, *args):
         self.close()
 
-    def __del__(self):
-        self.close()
-
     def _get_secure_creds(self, ca_cert, cert_key=None, cert_cert=None):
         cert_key_file = None
         cert_cert_file = None

requirements/base.txt

@@ -5,10 +5,10 @@
 #
 #    pip-compile-multi
 #
-grpcio==1.24.0
+grpcio==1.27.1
 protobuf==3.6.1
 six==1.12.0               # via grpcio, protobuf, tenacity
-tenacity==5.0.2
+tenacity==6.1.0
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools==41.2.0        # via protobuf

requirements/test.txt

@@ -10,14 +10,14 @@ alabaster==0.7.12         # via sphinx
 argparse==1.4.0           # via unittest2
 atomicwrites==1.3.0       # via pytest
 attrs==19.2.0             # via hypothesis, pytest
-babel==2.7.0              # via sphinx
+babel==2.8.0              # via sphinx
 bumpversion==0.5.3
 certifi==2019.9.11        # via requests
 cffi==1.12.3              # via xattr
 chardet==3.0.4            # via requests
 click==7.0                # via pifpaf
-coverage==4.5.4
-daiquiri==1.6.0           # via pifpaf
+coverage==5.0.1
+daiquiri==2.1.1           # via pifpaf
 docutils==0.15.2          # via sphinx
 entrypoints==0.3          # via flake8
 extras==1.0.0             # via testtools
@@ -27,48 +27,48 @@ flake8-docstrings==1.3.0
 flake8-import-order==0.18.1
 flake8-polyfill==1.0.2    # via flake8-docstrings
 flake8==3.7.8
-grpcio-tools==1.24.0
-hypothesis==4.56.1
+grpcio-tools==1.27.2
+hypothesis==4.56.3
 idna==2.8                 # via requests
 imagesize==1.1.0          # via sphinx
-importlib-metadata==0.23  # via pluggy, pytest
-jinja2==2.10.1            # via pifpaf, sphinx
+importlib-metadata==1.5.0  # via pluggy, pytest
+jinja2==2.11.1            # via pifpaf, sphinx
 linecache2==1.0.0         # via traceback2
 markupsafe==1.1.1         # via jinja2
 mccabe==0.6.1             # via flake8
 mock==2.0.0
 more-itertools==5.0.0
-packaging==19.2           # via pytest, sphinx
+packaging==20.3           # via pytest, sphinx
 pbr==5.4.3                # via fixtures, mock, pifpaf, testtools
 pifpaf==2.2.2
 pluggy==0.13.0            # via pytest, tox
 psutil==5.6.3             # via pifpaf
 py==1.8.0                 # via pytest, tox
 pycodestyle==2.5.0        # via flake8, flake8-import-order
-pycparser==2.19           # via cffi
+pycparser==2.20           # via cffi
 pydocstyle==3.0.0
 pyflakes==2.1.1           # via flake8
 pygments==2.4.2           # via sphinx
-pyparsing==2.4.2          # via packaging
+pyparsing==2.4.6          # via packaging
 pytest-cov==2.7.1
 pytest==4.6.5
 python-mimeparse==1.6.0   # via testtools
 pytz==2019.2              # via babel
-pyyaml==5.1
+pyyaml==5.3.1
 requests==2.22.0          # via sphinx
 snowballstemmer==2.0.0    # via pydocstyle, sphinx
 sphinx==1.8.2
 sphinxcontrib-websupport==1.1.2  # via sphinx
-testtools==2.3.0          # via fixtures
+testtools==2.4.0          # via fixtures
 toml==0.10.0              # via tox
-tox==3.5.3
+tox==3.14.5
 traceback2==1.4.0         # via testtools, unittest2
 unittest2==1.1.0          # via testtools
-urllib3==1.25.6           # via requests
-virtualenv==16.7.5        # via tox
-wcwidth==0.1.7            # via pytest
+urllib3==1.25.8           # via requests
+virtualenv==20.0.13        # via tox
+wcwidth==0.1.9            # via pytest
 xattr==0.9.6              # via pifpaf
-zipp==0.6.0               # via importlib-metadata
+zipp==1.0.0               # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools==41.2.0        # via flake8-import-order, protobuf, sphinx, tox