ceos-ard-cli 0.5.0__tar.gz → 0.5.2__tar.gz

{ceos_ard_cli-0.5.0 → ceos_ard_cli-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ceos-ard-cli
-Version: 0.5.0
+Version: 0.5.2
 Summary: CLI tools for CEOS-ARD to generate and validate PFS documents
 Project-URL: Homepage, https://github.com/ceos-org/ceos-ard-cli
 Project-URL: Repository, https://github.com/ceos-org/ceos-ard-cli
@@ -11,11 +11,10 @@ License-File: LICENSE
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.9
-Requires-Dist: bibtexparser==2.0.0b8
+Requires-Python: >=3.11
+Requires-Dist: bibtexparser==2.0.0b9
 Requires-Dist: click<9,>=8.0.0
 Requires-Dist: jinja2<4,>=3.1.0
-Requires-Dist: mergedeep<2,>=1.3.4
 Requires-Dist: playwright<2,>=1.50.0
 Requires-Dist: strictyaml<2,>=1.7.0
 Provides-Extra: dev
@@ -91,7 +90,7 @@ To create the Word, HTML, and PDF versions of a single PFS, run:
 The last part is the PFS to create, e.g. `SR` or `NRB`.
 
 To create a combined PFS, e.g. SAR, the following command can be used:
-`ceos-ard generate NRB POL ORB GSLC -o ../ceos-ard/build/ -i ../ceos-ard --docx --title="Combined Synthetic Aperture Radar" --version="1.1" --pfs-type="SAR" --id="SAR"`
+`ceos-ard generate NRB POL ORB GSLC -o ../ceos-ard/build/Combined-SAR -i ../ceos-ard --docx --title="Combined Synthetic Aperture Radar" --pfs-type="SAR" --id="SAR"`
 
 Check `ceos-ard generate --help` (or `ceos-ard generate --help`) for more details.
 

{ceos_ard_cli-0.5.0 → ceos_ard_cli-0.5.2}/README.md

@@ -64,7 +64,7 @@ To create the Word, HTML, and PDF versions of a single PFS, run:
 The last part is the PFS to create, e.g. `SR` or `NRB`.
 
 To create a combined PFS, e.g. SAR, the following command can be used:
-`ceos-ard generate NRB POL ORB GSLC -o ../ceos-ard/build/ -i ../ceos-ard --docx --title="Combined Synthetic Aperture Radar" --version="1.1" --pfs-type="SAR" --id="SAR"`
+`ceos-ard generate NRB POL ORB GSLC -o ../ceos-ard/build/Combined-SAR -i ../ceos-ard --docx --title="Combined Synthetic Aperture Radar" --pfs-type="SAR" --id="SAR"`
 
 Check `ceos-ard generate --help` (or `ceos-ard generate --help`) for more details.
 

{ceos_ard_cli-0.5.0 → ceos_ard_cli-0.5.2}/ceos_ard_cli/compile.py

@@ -151,9 +151,10 @@ def combine_pfs(multi_pfs):
         "combined": True,
         "id": [],
         "title": [],
-        "version": "",
+        "version": "n/a",
         "type": set(),
         "applies_to": {},
+        "background": {},
         "introduction": {},
         "glossary": {},
         "references": set(),
@@ -173,7 +174,12 @@ def combine_pfs(multi_pfs):
         data["id"].append(pfs["id"])
         data["title"].append(pfs["title"])
         data["type"].add(pfs["type"])
-        data["applies_to"][pfs["title"]] = pfs["applies_to"]
+        applies_to = pfs.get("applies_to", "").rstrip()
+        if applies_to:
+            data["applies_to"][pfs["title"]] = applies_to
+        background = pfs.get("background", "").rstrip()
+        if background:
+            data["background"][pfs["title"]] = background
         data["introduction"] = to_id_dict(pfs["introduction"])
         data["glossary"] = to_id_dict(pfs["glossary"])
         data["references"].update(pfs["references"])
@@ -221,6 +227,10 @@ def combine_pfs(multi_pfs):
     data["references"] = list(data["references"])
     data["annexes"] = list(data["annexes"].values())
 
+    if len(set(data["applies_to"].values())) == 1:
+        # If all applies_to are the same, simplify to a single string
+        data["applies_to"] = next(iter(data["applies_to"].values()))
+
     for value in categories.values():
         cat_id = value["id"]
         # Use topological sort to merge requirements from all PFS documents

{ceos_ard_cli-0.5.0 → ceos_ard_cli-0.5.2}/ceos_ard_cli/schema.py

@@ -137,7 +137,8 @@ PFS_DOCUMENT = lambda file, base_path: Map(
         "title": Str(),
         "version": Str(),
         "type": Str(),
-        "applies_to": Markdown(),
+        Optional("applies_to", default=""): Markdown(),
+        Optional("background", default=""): Markdown(),
         "authors": Markdown() | Seq(Str()),
         Optional("introduction", default=[]): _RESOLVED_SECTIONS(INTRODUCTION_PATH, base_path),
         "requirements": Seq(

ceos_ard_cli-0.5.2/ceos_ard_cli/version.py

@@ -0,0 +1 @@
+__version__ = "0.5.2"