Skip to content

Commit

Permalink
Merge branch 'modularize_refactor' into 'master'
Browse files Browse the repository at this point in the history
Add linting of the new devlab_bench package/module

See merge request te/devlab!15
  • Loading branch information
Dan Farnsworth committed Nov 26, 2020
2 parents a2fcebb + bf4db0c commit 248c795
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ syntax:
- python -m py_compile devlab
- python -m py_compile installer.py
- pylint devlab
- pylint -E devlab_bench
- pylint installer.py

make_pkg:
Expand Down
2 changes: 1 addition & 1 deletion devlab_bench/actions/down.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def action(components='*', rm=False, **kwargs):
components_to_stop = get_ordinal_sorting(components_to_stop, config['components'])
components_to_stop.reverse()
for comp in components_to_stop:
comp_cont_name = '{}-devlab'.format(comp)
comp_cont_name = '{}-devlab'.format(comp) #pylint: disable=duplicate-code
if comp == foreground_comp_name:
comp_type = config['foreground_component'].get('type', 'container')
else:
Expand Down
4 changes: 1 addition & 3 deletions devlab_bench/helpers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@
import os
import sys

import devlab_bench.helpers.command
import devlab_bench.helpers.docker
from devlab_bench.helpers.common import * #pylint: disable=wildcard-import
from devlab_bench.helpers.common import * #pylint: disable=wildcard-import,cyclic-import
2 changes: 1 addition & 1 deletion devlab_bench/helpers/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Command(object):
log_output: bool, whether to send the output of the command to the logger
logger: Logger object to use for messages
"""
def __init__(self, path, args=None, env=None, ignore_nonzero_rc=False, interactive=False, split=True, suppress_error_out=False, stdin=None, timeout=0, use_shell=False, log_output=False, logger=None, **kwargs):
def __init__(self, path, args=None, env=None, ignore_nonzero_rc=False, interactive=False, split=True, suppress_error_out=False, stdin=None, timeout=0, use_shell=False, log_output=False, logger=None, **kwargs): #pylint: disable=too-many-arguments
"""
Initialize the command object
"""
Expand Down
2 changes: 1 addition & 1 deletion devlab_bench/helpers/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import sys
from copy import deepcopy

import devlab_bench
import devlab_bench #pylint: disable=cyclic-import
from devlab_bench.exceptions import DevlabComponentError

#Python2/3 compatibility
Expand Down

0 comments on commit 248c795

Please sign in to comment.