Revert "tox: update lint regex to not require column"

This reverts commit 53f2444dbb.

Revert to avoid regression:
https://review.opendev.org/710208 just gave a lot of new linting warnings that look new "py38: DeprecationWarning: inspect.getargspec() is deprecated since Python 3.0, use inspect.signature() or inspect.getfullargspec()"

Change-Id: I26c862255cce6b6c99a69d9e3f5f4354db90f953
This commit is contained in:
Andreas Jaeger 2020-05-18 12:23:56 +00:00
parent 53f2444dbb
commit 2654d0338c
3 changed files with 20 additions and 12 deletions

View File

@ -1,8 +0,0 @@
workdir: .
output: |
roles/tox/tasks/main.yaml:41: [EZUULJOBS0001] Loop vars should have zj_ prefix
comments:
roles/tox/tasks/main.yaml:
- line: 41
message: "[EZUULJOBS0001] Loop vars should have zj_ prefix"

View File

@ -0,0 +1,10 @@
---
workdir: .
output: |
tests/test_discovery.py:25: YAMLLoadWarning: calling yaml.load() without Loader=... is deprecated, as the default Loader is unsafe. Please read https://msg.pyyaml.org/load for full details.
config = yaml.load(open('hiera/common.yaml', 'r'))
tests/test_discovery.py:714: UserWarning: Policy "foo:create_bar":"role:fizz" was deprecated in N in favor of "foo:create_bar":"". Reason: because of reasons. Either ensure your deployment is ready for the new default or copy/paste the deprecated policy into your policy file and maintain it manually.
warnings.warn(deprecated_msg)
WARNING [oslo_policy.policy] Policies ['foo', 'bar'] are part of a cyclical reference.
WARNING [oslo_policy.policy] Policies ['foo', 'bar'] are part of a cyclical reference.
comments: {}

View File

@ -41,7 +41,8 @@ import re
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
ANSI_RE = re.compile(r'(?:\x1B[@-_]|[\x80-\x9F])[0-?]*[ -/]*[@-~]') ANSI_RE = re.compile(r'(?:\x1B[@-_]|[\x80-\x9F])[0-?]*[ -/]*[@-~]')
LINT_RE = re.compile(r"^([^:]*):(\d+):((\d+):)?\s?(.*)$") PEP8_RE = re.compile(r"^(.*):(\d+):(\d+): (.*)$")
SPHINX_RE = re.compile(r"^([^:]*):([\d]+):(\w.+)$")
def simple_matcher(line, regex, file_path_group, start_line_group, def simple_matcher(line, regex, file_path_group, start_line_group,
@ -57,12 +58,17 @@ def simple_matcher(line, regex, file_path_group, start_line_group,
return file_path, start_line, message return file_path, start_line, message
def lint_matcher(line): def pep8_matcher(line):
return simple_matcher(line, LINT_RE, 1, 2, 5) return simple_matcher(line, PEP8_RE, 1, 2, 4)
def sphinx_matcher(line):
return simple_matcher(line, SPHINX_RE, 1, 2, 3)
matchers = [ matchers = [
lint_matcher, pep8_matcher,
sphinx_matcher,
] ]