Skip to content

Commit 4159e10

Browse files
committed
linting
1 parent 2428391 commit 4159e10

File tree

4 files changed

+23
-9
lines changed

4 files changed

+23
-9
lines changed

pytest_cloud/patches.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ def activate_env(channel, virtualenv_path, develop_eggs=None):
4141
:param develop_eggs: optional list of python packages to be installed in develop mode
4242
:type develop_eggs: list
4343
"""
44-
import os.path # pylint: disable=W0404
45-
import sys # pylint: disable=W0404
46-
import subprocess # pylint: disable=W0404
47-
from itertools import chain # pylint: disable=W0404
44+
import os.path # pylint: disable=W0404,C0415
45+
import sys # pylint: disable=W0404,C0415
46+
import subprocess # pylint: disable=W0404,C0415
47+
from itertools import chain # pylint: disable=W0404,C0415
4848
py3 = sys.version_info[0] > 2
4949
subprocess.check_call(['find', '.', '-name', '*.pyc', '-delete'])
5050
if virtualenv_path:

pytest_cloud/plugin.py

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from . import patches
3030

3131

32-
# pylint: disable=R0903
32+
# pylint: disable=R0903,R0205
3333
class CloudXdistPlugin(object):
3434
"""Plugin class to defer pytest-xdist hook handler."""
3535

@@ -43,13 +43,26 @@ def pytest_configure(config):
4343
config.pluginmanager.register(CloudXdistPlugin())
4444

4545

46+
# pylint: disable=W0105
47+
def _ensure_value(namespace, name, value):
48+
"""Ensure value in the namespace. Copied from older version of argparse as is."""
49+
if getattr(namespace, name, None) is None:
50+
setattr(namespace, name, value)
51+
return getattr(namespace, name)
52+
53+
4654
# pylint: disable=R0903
4755
class NodesAction(argparse.Action):
4856
"""Parses out a space-separated list of nodes and extends dest with it."""
4957

5058
def __call__(self, parser, namespace, values, option_string=None):
5159
"""Parse out space-separated list of nodes."""
52-
items = argparse._copy.copy(argparse._ensure_value(namespace, self.dest, []))
60+
if not hasattr(argparse, "_copy_items"):
61+
# pylint: disable=E1101
62+
copy = argparse._copy.copy
63+
else:
64+
copy = argparse._copy_items
65+
items = copy(_ensure_value(namespace, self.dest, []))
5366
items.extend([value.strip() for value in values.split()])
5467
setattr(namespace, self.dest, items)
5568

@@ -130,7 +143,7 @@ def get_node_capabilities(channel):
130143
:return: `dict` in form {'cpu_count': 1, 'virtual_memory': {'available': 100, 'total': 200}}
131144
:rtype: dict
132145
"""
133-
import psutil
146+
import psutil # pylint: disable=C0415
134147
memory = psutil.virtual_memory()
135148
caps = dict(cpu_count=psutil.cpu_count(), virtual_memory=dict(available=memory.available, total=memory.total))
136149
channel.send(caps)

pytest_cloud/rsync.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def make_reltoroot(roots, args):
2626
return res
2727

2828

29-
# pylint: disable=R0902
29+
# pylint: disable=R0902,R0205
3030
class RSync(object):
3131
"""Send a directory structure (recursively) to one or multiple remote filesystems."""
3232

tests/test_plugin.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def dic():
4646
return {}
4747

4848
def rep():
49-
# pylint: disable=R0903
49+
# pylint: disable=R0903,R0205
5050
class Report(object):
5151
skipped = []
5252
call = []
@@ -156,6 +156,7 @@ def test_schedule(
156156
params.append('--cloud-mem-per-process={0}'.format(mem_per_process))
157157
if max_processes:
158158
params.append('--cloud-max-processes={0}'.format(max_processes))
159+
159160
testdir.inline_run(*params)
160161
assert mocked_rsync.call_args[0] == (testdir.tmpdir, 'test')
161162
assert mocked_rsync.return_value.add_target_host.call_args_list == [

0 commit comments

Comments
 (0)