Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump pylint from 2.5.3 to 2.6.0 #262

Merged
merged 2 commits into from Aug 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
@@ -1,4 +1,5 @@
*.py[cod]
venv/*

# C extensions
*.so
Expand Down
2 changes: 1 addition & 1 deletion requirements-lint.txt
@@ -1,7 +1,7 @@
# linters
pycodestyle==2.6.0
pydocstyle==5.1.0
pylint==2.5.3
pylint==2.6.0
pygments
pyroma==2.6
-r requirements-test.txt
4 changes: 2 additions & 2 deletions src/pytest_elasticsearch/executor.py
Expand Up @@ -97,10 +97,10 @@ def version(self):
version['major'], version['minor'], version['patch']
])
)
except OSError:
except OSError as exc:
raise RuntimeError(
"'%s' does not point to elasticsearch." % self.executable
)
) from exc
return self._version

def _exec_command(self):
Expand Down
6 changes: 3 additions & 3 deletions src/pytest_elasticsearch/port.py
Expand Up @@ -26,7 +26,7 @@ class InvalidPortsDefinition(ValueError):

def __init__(self, ports):
"""Construct InvalidPortsDefinition exception."""
super(InvalidPortsDefinition, self).__init__(
super().__init__(
'Unknown format of ports: {0}.\n'.format(ports) + (
'You should provide a ports range "[(4000,5000)]"'
'or "(4000,5000)" or a comma-separated ports set'
Expand Down Expand Up @@ -74,8 +74,8 @@ def get_port(ports):
nums = set(filter_by_type(ports, int))
sets = set(chain(*filter_by_type(ports, (set, frozenset))))
ports_set = ports_set.union(ranges, sets, nums)
except ValueError:
raise InvalidPortsDefinition
except ValueError as exc:
raise InvalidPortsDefinition from exc

return port_for.select_random(ports_set)

Expand Down