Update CHANGES checker to support multiple files for the same issue (a…

…io-libs#6140)
altendky · Oct 27, 2021 · 0fc598c · 0fc598c
1 parent d379c6b
commit 0fc598c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CHANGES/4247.1.misc → CHANGES/4247.misc.1 b/CHANGES/4247.1.misc → CHANGES/4247.misc.1
diff --git a/tools/check_changes.py b/tools/check_changes.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python3
 
+import re
 import sys
 from pathlib import Path
 
-ALLOWED_SUFFIXES = [".feature", ".bugfix", ".doc", ".removal", ".misc"]
-ALLOWED_SUFFIXES += [f"{suffix}.rst" for suffix in ALLOWED_SUFFIXES]
+ALLOWED_SUFFIXES = ["feature", "bugfix", "doc", "removal", "misc"]
+PATTERN = re.compile(r"\d+\.(" + "|".join(ALLOWED_SUFFIXES) + r")(\.d+)?(.rst)?")
 
 
 def get_root(script_path):
@@ -25,15 +26,15 @@ def main(argv):
     for fname in changes.iterdir():
         if fname.name in (".gitignore", ".TEMPLATE.rst", "README.rst"):
             continue
-        if fname.suffix not in ALLOWED_SUFFIXES:
+        if not PATTERN.match(fname.name):
             if not failed:
                 print("")
-            print(fname, "has illegal suffix", file=sys.stderr)
+            print("Illegal CHANGES record", fname, file=sys.stderr)
             failed = True
 
     if failed:
         print("", file=sys.stderr)
-        print("Allowed suffixes are:", ALLOWED_SUFFIXES, file=sys.stderr)
+        print("See ./CHANGES/README.rst for the naming instructions", file=sys.stderr)
         print("", file=sys.stderr)
     else:
         print("OK")