Merge pull request #90 from mole99/fixes

Improvements to the summary, allow null in yaml

Changelog.md

@@ -1,4 +1,11 @@
-# 2.3.9
+# 2.3.11
+
+## Common
+
+- Bugfix: Do not crash if certain entries are missing from authorship
+- Improvement: Allow to specify `'null'` as `null`
+
+# 2.3.10
 
 ## Common
 

cace/__version__.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-__version__ = '2.3.10'
+__version__ = '2.3.11'
 
 if __name__ == '__main__':
     print(__version__, end='')

cace/common/cace_write.py

@@ -900,21 +900,21 @@ def markdown_summary(datasheet):
     result += ''.join(
         [
             f'**general**\n\n',
-            f'- name: {datasheet["name"]}\n',
-            f'- description: {datasheet["description"]}\n',
-            f'- commit: {datasheet["commit"]}\n',
-            f'- PDK: {datasheet["PDK"]}\n',
-            f'- cace_format: {datasheet["cace_format"]}\n\n',
+            f'- name: {datasheet["name"] if "name" in datasheet else ""}\n',
+            f'- description: {datasheet["description"] if "description" in datasheet else ""}\n',
+            f'- commit: {datasheet["commit"] if "commit" in datasheet else ""}\n',
+            f'- PDK: {datasheet["PDK"] if "PDK" in datasheet else ""}\n',
+            f'- cace_format: {datasheet["cace_format"] if "cace_format" in datasheet else ""}\n\n',
         ]
     )
 
     result += ''.join(
         [
             f'**authorship**\n\n',
-            f'- designer: {datasheet["authorship"]["designer"]}\n',
-            f'- company: {datasheet["authorship"]["company"]}\n',
-            f'- creation_date: {datasheet["authorship"]["creation_date"]}\n',
-            f'- license: {datasheet["authorship"]["license"]}\n\n',
+            f'- designer: {datasheet["authorship"]["designer"] if "designer" in datasheet["authorship"] else ""}\n',
+            f'- company: {datasheet["authorship"]["company"] if "company" in datasheet["authorship"] else ""}\n',
+            f'- creation_date: {datasheet["authorship"]["creation_date"] if "creation_date" in datasheet["authorship"] else ""}\n',
+            f'- license: {datasheet["authorship"]["license"] if "license" in datasheet["authorship"] else ""}\n\n',
         ]
     )
 

cace/parameter/simulation_job.py

@@ -342,6 +342,10 @@ def simulate(self, testbench, idy):
 
         # Format variables *must* exist in the parameter's "variables".
         for varname in formatvars:
+            # Support real null in yaml
+            if varname == None:
+                varname = 'null'
+
             if varname != 'null' and varname != 'result':
                 if 'variables' not in self.param or varname not in varnamelist:
                     err(