diff --git a/contrib/v22.06_2.0.0_BETA-0/EBBR.seq b/contrib/v22.06_2.0.0_BETA-0/EBBR.seq new file mode 100755 index 0000000000000000000000000000000000000000..9b531d9d9e494944a065958c578a1eea9cbaebf2 Binary files /dev/null and b/contrib/v22.06_2.0.0_BETA-0/EBBR.seq differ diff --git a/contrib/v22.06_2.0.0_BETA-0/EBBR_manual.seq b/contrib/v22.06_2.0.0_BETA-0/EBBR_manual.seq new file mode 100755 index 0000000000000000000000000000000000000000..243314f8cfc0183f6d1cdec4e6ae232f0b9a1518 Binary files /dev/null and b/contrib/v22.06_2.0.0_BETA-0/EBBR_manual.seq differ diff --git a/parser.py b/parser.py index ea2cea086c04a6ef1f0285b84127e41fa2f11af9..401b65a9eb3fea55121e9118abd4ad342b13898e 100755 --- a/parser.py +++ b/parser.py @@ -761,6 +761,11 @@ def ident_seq(seq_file, seq_db): logging.info( f"""{green}Identified{normal} `{seq_file}'""" f""" as "{x['name']}".""") + + if 'deprecated' in x: + logging.warning( + f"{yellow}This sequence file is deprecated!{normal}") + return x logging.warning(f"{yellow}Could not identify{normal} `{seq_file}'...") diff --git a/schemas/config-schema.yaml b/schemas/config-schema.yaml index 7b7b97c068f7c22e36677f350bd635136e1d14d4..155e008377cc19b1235d1bb38a7b723a513119a3 100644 --- a/schemas/config-schema.yaml +++ b/schemas/config-schema.yaml @@ -310,6 +310,7 @@ items: - TimeServicesTest - VariableServicesTest additionalProperties: false + minProperties: 1 update: type: object properties: @@ -343,6 +344,8 @@ items: type: string test set: type: string + additionalProperties: false + minProperties: 1 required: - rule - criteria diff --git a/schemas/seq_db-schema.yaml b/schemas/seq_db-schema.yaml index f342e4ddee0ce16db1559f4fd4e295e816d6f63c..a2ebbb6766a2e5649c95f512ee057c44af8e7fdf 100644 --- a/schemas/seq_db-schema.yaml +++ b/schemas/seq_db-schema.yaml @@ -13,6 +13,7 @@ properties: const: null seq_files: type: array + uniqueItems: true items: type: object properties: @@ -25,8 +26,12 @@ properties: enum: - EBBR.yaml - SIE.yaml + deprecated: + const: null required: - sha256 - name - config + # deprecated is optional additionalProperties: false + minProperties: 3 diff --git a/seq_db.yaml b/seq_db.yaml index aa1e4505b128e5f939944485ccc3c58153c02270..0d140b39886bf61bd3ab4e70c1366ecc3d3b3161 100644 --- a/seq_db.yaml +++ b/seq_db.yaml @@ -9,15 +9,17 @@ seq_files: - sha256: 6b83dbfbd1f07fc61a918297f02f449591a72131b64ac746f969a4210f97aee8 name: ACS-IR v21.05_0.8_BETA-0 EBBR.seq config: EBBR.yaml + deprecated: - sha256: c06684b3f8b35871e37b9447f609f9aab6070a7ca1c4ba63a52e029c018c9b73 name: ACS-IR v21.07_0.9_BETA EBBR.seq config: EBBR.yaml - sha256: d66485b5e436409ef8c0667baf5250e784cbf292f2b9ef1b3893d474a0585fae - name: ACS-IR v21.09_1.0 EBBR.seq + name: ACS-IR v21.09_1.0/v22.06_2.0.0_BETA-0 EBBR.seq config: EBBR.yaml - sha256: f7793d53c10106c1c275a4992e1710ce9863e210dd07581a3d783c4f4cf2312b name: ACS-IR v21.07_0.9_BETA or v21.09_1.0 EBBR_manual.seq config: EBBR.yaml + deprecated: - sha256: 7cb231d17fa9f580e75fee01c0295c9bd800fa6ba27501c7a1b941cbbdeaebfb name: Security interface extension ACS v21.10_SIE_REL1.0 BBSR.seq config: SIE.yaml