Support for v3 of schema in templates added. Warning that support for v2 will be removed.

Author: david-i-berry

csv2bufr/templates/__init__.py

@@ -29,6 +29,7 @@
 THISDIR = os.path.dirname(os.path.realpath(__file__))
 LOGGER = logging.getLogger(__name__)
 SCHEMA = f"{THISDIR}{os.sep}resources{os.sep}schema"
+SCHEMA_VERSIONS = ['csv2bufr-template-v2.json', 'csv2bufr-template-v3.json']
 TEMPLATE_DIRS = []  # [Path("./")]
 
 _SUCCESS_ = True
@@ -178,15 +179,17 @@ def index_templates() -> bool:
                     # check if valid mapping file
                     with template.open() as fh:
                         tmpl = json.load(fh)
-                    if 'csv2bufr-template-v3.json' not in tmpl.get("conformsTo",[]):  # noqa
-                        if 'csv2bufr-template-v2.json' in tmpl.get("conformsTo",[]):  # noqa
-                            LOGGER.warning("Deprecated 'csv2bufr-template-v2.json' found in " +  # noqa
-                                       f"conformsTo for file {template}")  # noqa
-                            LOGGER.warning("Support for 'csv2bufr-template-v2.json' will be removed in a future release")  # noqa
-                        else:
-                            LOGGER.warning("'csv2bufr-template-v3.json' not found in " +  # noqa
-                                       f"conformsTo for file {template}, skipping")  # noqa
-                            continue
+                    valid_schema = False
+                    for sc in SCHEMA_VERSIONS:
+                        if sc in tmpl.get("conformsTo",[]):
+                            valid_schema = True
+                            break
+                    if not valid_schema:
+                        LOGGER.warning(
+                            "No valid schema not found in " +  # noqa
+                            f"conformsTo for file {template}, skipping")  # noqa
+                        continue
+
                     if validate_template(tmpl) == _SUCCESS_:
                         # get label if exists else set to empty string
                         fname = str(template)