From b602d18706196372753c598baa8e73cb323e6e07 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 18 Jul 2016 12:03:19 -0400 Subject: [PATCH 1/2] pylint 1.6.3 complains about not calling . --- gcloud/logging/test__gax.py | 3 ++- gcloud/pubsub/test__gax.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gcloud/logging/test__gax.py b/gcloud/logging/test__gax.py index d68082109cde..a47ad12f0357 100644 --- a/gcloud/logging/test__gax.py +++ b/gcloud/logging/test__gax.py @@ -898,7 +898,8 @@ class _DummyException(AbortionError): code = status_code def __init__(self): - pass + super(_DummyException, self).__init__( + None, None, self.code, None) return _DummyException() diff --git a/gcloud/pubsub/test__gax.py b/gcloud/pubsub/test__gax.py index 2426d2dfb7e8..70e4249d7e47 100644 --- a/gcloud/pubsub/test__gax.py +++ b/gcloud/pubsub/test__gax.py @@ -749,7 +749,8 @@ class _DummyException(AbortionError): code = status_code def __init__(self): - pass + super(_DummyException, self).__init__( + None, None, self.code, None) return _DummyException() From cdf2e3715b8d80cba5d58a0a07789c6bcc68f5d2 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 18 Jul 2016 12:04:01 -0400 Subject: [PATCH 2/2] Bump minimum pylint version to 1.6.3. Allow it to check files that cause 1.6.0 to barf. --- scripts/run_pylint.py | 4 ---- tox.ini | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/run_pylint.py b/scripts/run_pylint.py index 52449e352828..6b77246d8bb5 100644 --- a/scripts/run_pylint.py +++ b/scripts/run_pylint.py @@ -37,10 +37,6 @@ ] IGNORED_FILES = [ os.path.join('docs', 'conf.py'), - # Both these files cause pylint 1.6 to barf. See: - # https://github.com/PyCQA/pylint/issues/998 - os.path.join('gcloud', 'bigtable', 'happybase', 'connection.py'), - os.path.join('gcloud', 'streaming', 'http_wrapper.py'), 'setup.py', ] SCRIPTS_DIR = os.path.abspath(os.path.dirname(__file__)) diff --git a/tox.ini b/tox.ini index 71697f05f210..9ce84c03873a 100644 --- a/tox.ini +++ b/tox.ini @@ -133,10 +133,12 @@ commands = python {toxinidir}/scripts/run_pylint.py deps = pep8 - pylint + pylint >= 1.6.3 unittest2 psutil Sphinx +setenv = + PYTHONPATH = passenv = {[testenv:system-tests]passenv} [testenv:system-tests]