From da45cc834f78ca23a8ff1a3215b96a5e512e5345 Mon Sep 17 00:00:00 2001
From: Marc Garreau <3621728+marcgarreau@users.noreply.github.com>
Date: Thu, 16 Jul 2020 15:55:13 -0600
Subject: [PATCH 1/2] adopt trinity's newsfragment validation

---
 newsfragments/validate_files.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 newsfragments/validate_files.py

diff --git a/newsfragments/validate_files.py b/newsfragments/validate_files.py
old mode 100644
new mode 100755
index b60b8723df..bf900f3a63
--- a/newsfragments/validate_files.py
+++ b/newsfragments/validate_files.py
@@ -5,12 +5,12 @@
 
 import os
 import pathlib
+import sys
 
 ALLOWED_EXTENSIONS = {
-    '.feature.rst',
     '.bugfix.rst',
     '.doc.rst',
-    '.removal.rst',
+    '.feature.rst',
     '.misc.rst',
 }
 
@@ -21,11 +21,20 @@
 
 THIS_DIR = pathlib.Path(__file__).parent
 
+num_args = len(sys.argv) - 1
+assert num_args in {0, 1}
+if num_args == 1:
+    assert sys.argv[1] in ('is-empty', )
+
 for fragment_file in THIS_DIR.iterdir():
 
     if fragment_file.name in ALLOWED_FILES:
         continue
-
-    full_extension = "".join(fragment_file.suffixes)
-    if full_extension not in ALLOWED_EXTENSIONS:
+    elif num_args == 0:
+        full_extension = "".join(fragment_file.suffixes)
+        if full_extension not in ALLOWED_EXTENSIONS:
+            raise Exception(f"Unexpected file: {fragment_file}")
+    elif sys.argv[1] == 'is-empty':
         raise Exception(f"Unexpected file: {fragment_file}")
+    else:
+        raise RuntimeError("Strange: arguments {sys.argv} were validated, but not found")

From 2087894b4932d9cc6574ce6cbe3975a5dcac90a4 Mon Sep 17 00:00:00 2001
From: Marc Garreau <3621728+marcgarreau@users.noreply.github.com>
Date: Thu, 16 Jul 2020 19:55:40 -0600
Subject: [PATCH 2/2] add newsfragment

---
 newsfragments/1690.misc.rst     | 1 +
 newsfragments/validate_files.py | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 newsfragments/1690.misc.rst

diff --git a/newsfragments/1690.misc.rst b/newsfragments/1690.misc.rst
new file mode 100644
index 0000000000..17ccb1d140
--- /dev/null
+++ b/newsfragments/1690.misc.rst
@@ -0,0 +1 @@
+Adopt Trinity's newsfragment validation script.
diff --git a/newsfragments/validate_files.py b/newsfragments/validate_files.py
index bf900f3a63..b2ebbba1a6 100755
--- a/newsfragments/validate_files.py
+++ b/newsfragments/validate_files.py
@@ -12,6 +12,7 @@
     '.doc.rst',
     '.feature.rst',
     '.misc.rst',
+    '.removal.rst',
 }
 
 ALLOWED_FILES = {