strictdoc 0.0.55a1__tar.gz → 0.0.56__tar.gz

{strictdoc-0.0.55a1 → strictdoc-0.0.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: strictdoc
-Version: 0.0.55a1
+Version: 0.0.56
 Summary: StrictDoc is open-source software for technical documentation and requirements management.
 Project-URL: Changelog, https://github.com/strictdoc-project/strictdoc/blob/main/CHANGELOG.md
 Project-URL: Homepage, https://strictdoc.readthedocs.io/en/stable/
@@ -28,7 +28,7 @@ Requires-Dist: html5lib>=1.1
 Requires-Dist: jinja2>=2.11.2
 Requires-Dist: lxml==4.*,>=4.6.2
 Requires-Dist: pygments==2.*,>=2.10.0
-Requires-Dist: python-datauri==0.*,>=0.2.9
+Requires-Dist: python-datauri==2.*,>=2.1.1
 Requires-Dist: python-multipart
 Requires-Dist: reqif==0.*,>=0.0.39
 Requires-Dist: requests

{strictdoc-0.0.55a1 → strictdoc-0.0.56}/pyproject.toml

@@ -66,7 +66,7 @@ dependencies = [
     # Static HTML export with embedded assets.
     "beautifulsoup4 >= 4.12.0, == 4.*",
     "html5lib>=1.1",  # Used by beautifulsoup4 as an optional plugin.
-    "python-datauri >= 0.2.9, == 0.*",
+    "python-datauri >= 2.1.1, == 2.*",
 
     # Excel
     "XlsxWriter >= 1.3.7, == 1.*",

{strictdoc-0.0.55a1 → strictdoc-0.0.56}/strictdoc/__init__.py

@@ -1,6 +1,6 @@
 from strictdoc.core.environment import SDocRuntimeEnvironment
 
-__version__ = "0.0.55a1"
+__version__ = "0.0.56"
 
 
 environment = SDocRuntimeEnvironment(__file__)

{strictdoc-0.0.55a1 → strictdoc-0.0.56}/strictdoc/backend/excel/excel_import.py

@@ -1,3 +1,4 @@
+# mypy: disable-error-code="no-untyped-def"
 from strictdoc.backend.excel.import_.excel_to_sdoc_converter import (
     ExcelToSDocConverter,
 )

{strictdoc-0.0.55a1 → strictdoc-0.0.56}/strictdoc/backend/excel/export/excel_generator.py

@@ -1,3 +1,4 @@
+# mypy: disable-error-code="arg-type,no-untyped-def,type-arg,union-attr,var-annotated"
 import os
 from pathlib import Path
 from typing import Dict, List
@@ -97,7 +98,11 @@ class ExcelGenerator:
                         field_uc = field.upper()
 
                         # Special treatment for ParentReqReference and Comments
-                        if field_uc in ("REFS:PARENT", "PARENT", "PARENTS"):
+                        if field_uc in (
+                            "RELATIONS:PARENT",
+                            "PARENT",
+                            "PARENTS",
+                        ):
                             parent_refs = node.get_requirement_references(
                                 ReferenceType.PARENT
                             )
@@ -128,47 +133,50 @@ class ExcelGenerator:
                             # Using a transition marker to separate multiple
                             # comments
                             if node.comments:
-                                value = ""
+                                comment_row_value: str = ""
                                 for comment in node.comments:
-                                    if len(value) > 0:
-                                        value += "\n----------\n"
-                                    value += comment
-                                worksheet.write(row, idx, value)
+                                    if len(comment_row_value) > 0:
+                                        comment_row_value += "\n----------\n"
+                                    comment_row_value += comment
+                                worksheet.write(row, idx, comment_row_value)
                                 if (
-                                    value
-                                    and len(value)
+                                    comment_row_value
+                                    and len(comment_row_value)
                                     > columns[field][MAX_WIDTH_KEY]
                                 ):
-                                    columns[field][MAX_WIDTH_KEY] = len(value)
-                        elif field_uc in node.ordered_fields_lookup.keys():
-                            req_field = node.ordered_fields_lookup[field_uc][0]
-                            value = ""
-                            if req_field.field_value_references:
+                                    columns[field][MAX_WIDTH_KEY] = len(
+                                        comment_row_value
+                                    )
+                        elif field_uc == "RELATIONS":
+                            if len(node.relations) > 0:
+                                relations_components = []
                                 # Using a transition marker to separate
                                 # multiple references
-                                for ref in req_field.field_value_references:
-                                    if len(value) > 0:
-                                        value += "----------\n"
+                                for ref in node.relations:
                                     if isinstance(ref, ParentReqReference):
-                                        value += (
-                                            ref.ref_type
-                                            + ": "
-                                            + ref.ref_uid
-                                            + "\n"
+                                        relations_components.append(
+                                            ref.ref_type + ": " + ref.ref_uid
                                         )
                                     elif isinstance(ref, FileReference):
-                                        value += (
+                                        relations_components.append(
                                             ref.ref_type
                                             + ": "
                                             + ref.get_posix_path()
-                                            + "\n"
                                         )
-                            else:
-                                value = req_field.get_value()
+                                relations_row_value: str = (
+                                    "\n----------\n".join(relations_components)
+                                )
+                                worksheet.write(row, idx, relations_row_value)
+                                value_len = len(relations_row_value)
+                                if value_len > columns[field][MAX_WIDTH_KEY]:
+                                    columns[field][MAX_WIDTH_KEY] = value_len
+                        elif field_uc in node.ordered_fields_lookup.keys():
+                            req_field = node.ordered_fields_lookup[field_uc][0]
+                            value: str = req_field.get_value()
                             worksheet.write(row, idx, value)
-                            vallength = len(value)
-                            if vallength > columns[field][MAX_WIDTH_KEY]:
-                                columns[field][MAX_WIDTH_KEY] = vallength
+                            value_len = len(value)
+                            if value_len > columns[field][MAX_WIDTH_KEY]:
+                                columns[field][MAX_WIDTH_KEY] = value_len
                         elif hasattr(node, "special_fields"):
                             if len(node.special_fields):
                                 for special_field in node.special_fields:

{strictdoc-0.0.55a1 → strictdoc-0.0.56}/strictdoc/backend/excel/import_/excel_to_sdoc_converter.py

@@ -1,3 +1,4 @@
+# mypy: disable-error-code="no-untyped-call,no-untyped-def"
 import os
 from typing import List, NamedTuple, Optional, Tuple
 
@@ -37,7 +38,6 @@ def safe_name(dangerous_name):
     return dangerous_name
 
 
-# pylint: disable=too-many-instance-attributes
 class ExcelToSDocConverter:
     @staticmethod
     # optional argument title is present for external scripts to assign a title
@@ -201,29 +201,19 @@ class ExcelToSDocConverter:
                         field_name=name,
                         field_value=None,
                         field_value_multiline=value,
-                        field_value_references=None,
                     )
                 ]
         if parent_uid is not None:
             reference = ParentReqReference(
                 template_requirement, parent_uid, role=None
             )
-
-            requirement_field = SDocNodeField(
-                parent=template_requirement,
-                field_name="REFS",
-                field_value=None,
-                field_value_multiline=None,
-                field_value_references=[reference],
-            )
-            template_requirement.ordered_fields_lookup["REFS"] = [
-                requirement_field
-            ]
+            template_requirement.relations = [reference]
         requirement = SDocNode(
             parent=template_requirement.parent,
             requirement_type=template_requirement.requirement_type,
             mid=None,
             fields=list(template_requirement.enumerate_fields()),
+            relations=template_requirement.relations,
         )
 
         return requirement