Commit 97fa3195 authored by Luke Mewburn's avatar Luke Mewburn
Browse files

testing: convert *_ignore_patterns to ignore substr 

Rename asn_config.json field "lint_ignore_patterns" to "lint_ignore",
and rework to a list of substrings instead of Path patterns,
as pathlib.Path.full_match() isn't available in python < 3.13.
This is similar to the previous asn_ignore_lint.txt behaviour.

Rename asn_config.json field "parse_ignore_patterns" to "parse_ignore",
similar to "lint_ignore" above.

Use slightly more specific substrings in the ignore lists.
parent 6c82ee04

testing/asn_config.json

+5 −5
Original line number Diff line number Diff line
@@ -124,11 +124,11 @@ 
      ]

    }

  },

  "lint_ignore_patterns": [

    "33108/**",

    "testing/dependencies/**"

  "lint_ignore": [

    "33108/",

    "testing/dependencies/"

  ],

  "parse_ignore_patterns": [

    "33108/**"

  "parse_ignore": [

    "33108/"

  ]

}

testing/asn_process.py

+6 −6
Original line number Diff line number Diff line
@@ -27,14 +27,14 @@ change_path_to_unix = False 




def filterIgnoredFiles(pathList, ignoreList):

    """Return pathList with paths matching those in ignoreList removed."""

    """Return pathList with paths removed that contain substrings in ignoreList."""

    ignoredFiles = set()

    for ignore in ignoreList:

        logging.debug(f"Ignoring pattern {ignore} for parsing")

        logging.debug(f"Ignoring substring {ignore}")

        for file in pathList:

            if file.full_match(ignore):

            if ignore in str(file):

                ignoredFiles.add(file)

                logging.debug(f" Ignoring {str(file)} for parsing as matches {ignore}")

                logging.debug(f" Ignoring {str(file)} as contains {ignore}")

    logging.info(f"{len(ignoredFiles)} files ignored")

    for file in ignoredFiles:

        logging.debug(f"  {file}")
@@ -187,7 +187,7 @@ if __name__ == "__main__": 
    for file in fileList:

        logging.debug(f"  {file}")



    parseFileList = filterIgnoredFiles(fileList, asnConfig["parse_ignore_patterns"])

    parseFileList = filterIgnoredFiles(fileList, asnConfig["parse_ignore"])

    logging.info(f"{len(parseFileList)} files to parse")

    for file in parseFileList:

        logging.debug(f"  {file}")
@@ -210,7 +210,7 @@ if __name__ == "__main__": 
        exit(1)



    logging.info("Linting files")

    lintFileList = filterIgnoredFiles(fileList, asnConfig["lint_ignore_patterns"])

    lintFileList = filterIgnoredFiles(fileList, asnConfig["lint_ignore"])

    logging.info(f"{len(lintFileList)} files to lint")

    for file in lintFileList:

        logging.debug(f"  {file}")