Skip to content

Commit bafae70

Browse files
committed
feat(scanner): move .scannerignore to script directory and update lookup logic
1 parent d771258 commit bafae70

3 files changed

Lines changed: 22 additions & 2 deletions

File tree

scripts/version_scanner/tests/unit/test_version_scanner.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,25 @@ def test_load_ignore_file(tmp_path):
327327

328328
assert ignore_dirs == ["dir1", "dir2"]
329329

330+
@mock.patch('version_scanner.load_ignore_file')
331+
@mock.patch('version_scanner.scan_repository')
332+
def test_main_loads_ignore_from_script_dir(mock_scan, mock_load_ignore):
333+
mock_load_ignore.return_value = []
334+
mock_scan.return_value = []
335+
336+
import sys
337+
test_args = ["version_scanner.py", "-d", "python", "-v", "3.7"]
338+
339+
with mock.patch('sys.argv', test_args):
340+
from version_scanner import main
341+
main()
342+
343+
mock_load_ignore.assert_called_once()
344+
args, kwargs = mock_load_ignore.call_args
345+
path = args[0]
346+
assert ".scannerignore" in path
347+
assert "scripts/version_scanner" in path
348+
330349

331350
@mock.patch('version_scanner.build')
332351
@mock.patch('google.auth.default')

scripts/version_scanner/version_scanner.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,9 @@ def main():
520520

521521

522522

523-
# Load ignore file
524-
ignore_file_path = os.path.join(args.path, ".scannerignore")
523+
# Load ignore file from script directory (Option A)
524+
script_dir = os.path.dirname(os.path.abspath(__file__))
525+
ignore_file_path = os.path.join(script_dir, ".scannerignore")
525526
ignore_dirs = load_ignore_file(ignore_file_path)
526527
if ignore_dirs:
527528
print(f"Loaded {len(ignore_dirs)} ignore patterns from {ignore_file_path}")

0 commit comments

Comments
 (0)