Skip to content

Commit

Permalink
Upgrade pylint to 2.6.0 (elastic#1078)
Browse files Browse the repository at this point in the history
  • Loading branch information
hub-cap authored Oct 8, 2020
1 parent bcf9bb8 commit 7b03c4f
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 9 deletions.
4 changes: 3 additions & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,9 @@ disable=print-statement,
W0612,
W0613,
W0621,
invalid-docstring-quote
invalid-docstring-quote,
raise-missing-from,
assignment-from-none


# Enable the message, report, category or checker with the given id(s). You can
Expand Down
4 changes: 2 additions & 2 deletions esrally/driver/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class Runner:
"""

def __init__(self, *args, **kwargs):
super(Runner, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
self.logger = logging.getLogger(__name__)

async def __aenter__(self):
Expand All @@ -148,7 +148,7 @@ class Delegator:
Mixin to unify delegate handling
"""
def __init__(self, delegate, *args, **kwargs):
super(Delegator, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
self.delegate = delegate


Expand Down
2 changes: 1 addition & 1 deletion it/configuration_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
class TestConfigure:
def test_configure(self):
# just run to test the configuration procedure, don't use this configuration in other tests.
assert it.esrally(CFG_FILE, f"configure --assume-defaults") == 0
assert it.esrally(CFG_FILE, "configure --assume-defaults") == 0

@classmethod
def teardown_class(cls):
Expand Down
2 changes: 1 addition & 1 deletion it/docker_dev_image_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ def run_docker_compose_up(test_command):

def run_docker_compose_down():
if process.run_subprocess_with_logging(f"docker-compose -f {it.ROOT_DIR}/docker/docker-compose-tests.yml down -v") != 0:
raise AssertionError(f"Failed to stop running containers from docker-compose-tests.yml")
raise AssertionError("Failed to stop running containers from docker-compose-tests.yml")
4 changes: 2 additions & 2 deletions it/proxy_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ def http_proxy():
f"-v {config_dir}/squid.conf:/etc/squid/squid.conf "
f"-p 3128:3128 datadog/squid")
proxy_container_id = lines[0].strip()
proxy = HttpProxy(authenticated_url=f"http://testuser:[email protected]:3128",
anonymous_url=f"http://127.0.0.1:3128")
proxy = HttpProxy(authenticated_url="http://testuser:[email protected]:3128",
anonymous_url="http://127.0.0.1:3128")
yield proxy
process.run_subprocess(f"docker stop {proxy_container_id}")

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def str_from_file(name):
"twine==1.15.0",
"wheel==0.33.6",
"github3.py==1.3.0",
"pylint==2.4.2",
"pylint==2.6.0",
"pylint-quotes==0.2.1"
]

Expand Down
2 changes: 1 addition & 1 deletion tests/utils/io_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def test_decompresses_supported_file_formats_with_lib_as_failover(self, mocked_i
f"Could not decompress [{archive_path}] to [{decompressed_path}] (target file is corrupt)"

if ext in ["bz2", "gz"]:
assert f"not found in PATH. Using standard library, decompression will take longer." in mocked_console_warn.call_args[0][0]
assert "not found in PATH. Using standard library, decompression will take longer." in mocked_console_warn.call_args[0][0]

@mock.patch("subprocess.run")
def test_decompress_manually_external_fails_if_tool_missing(self, mocked_run):
Expand Down

0 comments on commit 7b03c4f

Please sign in to comment.