Skip to content

Commit 69be8cc

Browse files
committed
chore(ci): run pre-commit run --all-files
This appears to be run in Travis and is failing because these fixes were required, so apply them to get Travis passing again.
1 parent cf87b15 commit 69be8cc

25 files changed

+53
-52
lines changed

detect_secrets/plugins/base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def __init__(
5959
exclude_lines_regex=None,
6060
should_verify=False,
6161
false_positive_heuristics=None,
62-
**kwargs
62+
**kwargs,
6363
):
6464
"""
6565
:type exclude_lines_regex: str|None
@@ -426,7 +426,7 @@ def secret_generator( # lgtm [py/inheritance/incorrect-overridden-signature]
426426
self,
427427
string,
428428
*args,
429-
**kwargs
429+
**kwargs,
430430
):
431431
for regex in self.denylist:
432432
for match in regex.findall(string):

detect_secrets/plugins/common/initialize.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def from_parser_builder(
4141
automaton=automaton,
4242
should_verify_secrets=should_verify_secrets,
4343
plugin_filenames=plugin_filenames,
44-
**plugins_dict[plugin_name]
44+
**plugins_dict[plugin_name],
4545
),
4646
)
4747

@@ -200,7 +200,7 @@ def from_plugin_classname(
200200
exclude_lines_regex=exclude_lines_regex,
201201
automaton=automaton,
202202
should_verify=should_verify_secrets,
203-
**kwargs
203+
**kwargs,
204204
)
205205
except TypeError:
206206
log.warning('Unable to initialize plugin!')
@@ -248,5 +248,5 @@ def from_secret_type(secret_type, settings, plugin_filenames=None):
248248
automaton=None,
249249
should_verify_secrets=False,
250250

251-
**plugin_init_vars
251+
**plugin_init_vars,
252252
)

detect_secrets/plugins/high_entropy_strings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def __init__(self, charset, limit, exclude_lines_regex, automaton, *args, **kwar
4747
exclude_lines_regex=exclude_lines_regex,
4848
false_positive_heuristics=false_positive_heuristics,
4949
*args,
50-
**kwargs
50+
**kwargs,
5151
)
5252

5353
def analyze(self, file, filename, output_raw=False, output_verified_false=False):
@@ -337,7 +337,7 @@ def __init__(self, hex_limit, exclude_lines_regex=None, automaton=None, **kwargs
337337
limit=hex_limit,
338338
exclude_lines_regex=exclude_lines_regex,
339339
automaton=automaton,
340-
**kwargs
340+
**kwargs,
341341
)
342342

343343
@classproperty

detect_secrets/plugins/keyword.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ def __init__(self, keyword_exclude=None, exclude_lines_regex=None, automaton=Non
288288
super(KeywordDetector, self).__init__(
289289
exclude_lines_regex=exclude_lines_regex,
290290
false_positive_heuristics=false_positive_heuristics,
291-
**kwargs
291+
**kwargs,
292292
)
293293

294294
self.keyword_exclude = None

tests/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import sys
21
import os
2+
import sys
33

4-
sys.path.append(os.path.join(os.path.dirname(__file__), "testing"))
4+
sys.path.append(os.path.join(os.path.dirname(__file__), 'testing'))

tests/core/audit_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
import mock
77
import pytest
8-
9-
from detect_secrets.core import audit
10-
from detect_secrets.core.constants import POTENTIAL_SECRET_DETECTED_NOTE
118
from testing.factories import potential_secret_factory
129
from testing.mocks import mock_open as mock_open_base
1310
from testing.mocks import mock_printer as mock_printer_base
1411
from testing.util import uncolor
1512

13+
from detect_secrets.core import audit
14+
from detect_secrets.core.constants import POTENTIAL_SECRET_DETECTED_NOTE
15+
1616

1717
@pytest.fixture(autouse=True)
1818
def reset_file_cache():

tests/core/baseline_test.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33

44
import mock
55
import pytest
6+
from testing.factories import secrets_collection_factory
7+
from testing.mocks import mock_git_calls
8+
from testing.mocks import mock_open
9+
from testing.mocks import SubprocessMock
610

711
from detect_secrets.core import baseline
812
from detect_secrets.core.baseline import format_baseline_for_output
@@ -14,10 +18,6 @@
1418
from detect_secrets.core.potential_secret import PotentialSecret
1519
from detect_secrets.plugins.high_entropy_strings import Base64HighEntropyString
1620
from detect_secrets.plugins.high_entropy_strings import HexHighEntropyString
17-
from testing.factories import secrets_collection_factory
18-
from testing.mocks import mock_git_calls
19-
from testing.mocks import mock_open
20-
from testing.mocks import SubprocessMock
2121

2222

2323
class TestInitializeBaseline:

tests/core/potential_secret_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import pytest
2-
32
from testing.factories import potential_secret_factory
43

54

tests/core/report/conditions_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
from copy import deepcopy
33

44
import mock
5+
from testing.baseline import baseline
6+
from testing.baseline import baseline_filename
57

68
from detect_secrets.core import audit
79
from detect_secrets.core.report.conditions import fail_on_audited_real
810
from detect_secrets.core.report.conditions import fail_on_live
911
from detect_secrets.core.report.conditions import fail_on_unaudited
1012
from detect_secrets.core.report.constants import ReportExitCode
1113
from detect_secrets.core.report.constants import ReportSecretType
12-
from testing.baseline import baseline
13-
from testing.baseline import baseline_filename
1414

1515

1616
class TestReportConditions:

tests/core/report/output_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
import mock
55
import pytest
6+
from testing.baseline import baseline
7+
from testing.baseline import baseline_filename
68

79
from detect_secrets.core import audit
810
from detect_secrets.core.color import AnsiColor
@@ -13,8 +15,6 @@
1315
from detect_secrets.core.report.output import print_stats
1416
from detect_secrets.core.report.output import print_summary
1517
from detect_secrets.core.report.output import print_table_report
16-
from testing.baseline import baseline
17-
from testing.baseline import baseline_filename
1818

1919

2020
@pytest.fixture

0 commit comments

Comments
 (0)