Merge pull request #1914 from camptocamp/use-security-md

Use security.md

c2cciutils/audit.py

@@ -9,9 +9,10 @@
 import sys
 from argparse import Namespace
 
+import security_md
+
 import c2cciutils
 import c2cciutils.configuration
-import c2cciutils.security
 
 
 def print_versions(
@@ -209,17 +210,17 @@ def outdated_versions(
         return True
 
     with open("SECURITY.md", encoding="utf-8") as security_file:
-        security = c2cciutils.security.Security(security_file.read())
+        security = security_md.Security(security_file.read())
 
     version_index = security.version_index
     date_index = security.support_until_index
 
     for row in security.data:
         str_date = row[date_index]
         if str_date not in (
-            c2cciutils.security.SUPPORT_TO_BE_DEFINED,
-            c2cciutils.security.SUPPORT_BEST_EFFORT,
-            c2cciutils.security.SUPPORT_UNSUPPORTED,
+            security_md.SUPPORT_TO_BE_DEFINED,
+            security_md.SUPPORT_BEST_EFFORT,
+            security_md.SUPPORT_UNSUPPORTED,
         ):
             date = datetime.datetime.strptime(row[date_index], "%d/%m/%Y")
             if date < datetime.datetime.now():

c2cciutils/scripts/publish.py

@@ -13,6 +13,7 @@
 from typing import Optional, cast
 
 import requests
+import security_md
 import yaml
 
 import c2cciutils
@@ -21,7 +22,6 @@
 import c2cciutils.lib.docker
 import c2cciutils.publish
 import c2cciutils.scripts.download_applications
-import c2cciutils.security
 from c2cciutils.publish import GoogleCalendar
 from c2cciutils.scripts.trigger_image_update import dispatch
 
@@ -213,7 +213,7 @@ def main() -> None:
                 print(f"::error:: {security_response.status_code} {security_response.text}")
                 sys.exit(1)
 
-        security = c2cciutils.security.Security(security_text)
+        security = security_md.Security(security_text)
         version_index = security.version_index
         alternate_tag_index = security.alternate_tag_index