oldhepdata: allow absence of "location", "description", or record_ids

* Write absence of "location" or "description" as empty strings instead of None.
* Check for presence of "description" before deciding whether to reformat matrix based on words in description.
* Fix bug writing record_id if key but not value given in original file.
* Bump version to 0.1.30.

Signed-off-by: Graeme Watt <[email protected]>

hepdata_converter/parsers/__init__.py

@@ -40,8 +40,8 @@ def __init__(self, index=None, data_file=None, table_name=None, metadata=None, d
 
         self.metadata = metadata or {
             'name': table_name or 'Table %s' % self.index,
-            'location': None,
-            'description': None,
+            'location': '',
+            'description': '',
             'keywords': [
                 {'name': 'reactions', 'values': []},
                 {'name': 'observables', 'values': []},

hepdata_converter/parsers/oldhepdata_parser.py

@@ -388,8 +388,9 @@ def _parse_table_data(self, data):
                 energy = energy_min
             self._parse_energies(energy)
 
-        if any(word in self.current_table.description.lower() for word in ['covariance', 'correlation', 'matrix']):
-            reformatted = self._reformat_matrix()
+        if self.current_table.description:
+            if any(word in self.current_table.description.lower() for word in ['covariance', 'correlation', 'matrix']):
+                reformatted = self._reformat_matrix()
 
     def _reformat_matrix(self):
         """Transform a square matrix into a format with two independent variables and one dependent variable.
@@ -656,7 +657,7 @@ def _parse_record_ids(self, data):
             if 'record_ids' not in self.data[0]:
                 self.data[0]['record_ids'] = []
 
-            record_id = {'type': key, 'id': int(data)}
+            record_id = {'type': key, 'id': int(data) if data else 0}
 
             if self.data[0]['record_ids'].count(record_id) == 0:
                 self.data[0]['record_ids'].append(record_id)

hepdata_converter/version.py

@@ -1,3 +1,3 @@
 # this file ideally should only contain __version__ declaration, as anything else
 # may break setup.py and PyPI uploads
-__version__ = '0.1.29'
+__version__ = '0.1.30'