Skip to content
Snippets Groups Projects
Commit 50b5d7fb authored by Theodore Chang's avatar Theodore Chang
Browse files

Merge branch...

Merge branch '1410-tabular-parsing-bug-in-datetime-quantities-read-from-spreadsheet-files' into 'develop'

Resolve "Tabular parsing: bug in datetime quantities read from spreadsheet files"

Closes #1410

See merge request !1191
parents b452e069 d0f131ad
No related branches found
No related tags found
1 merge request!1191Resolve "Tabular parsing: bug in datetime quantities read from spreadsheet files"
Pipeline #161154 failed
......@@ -17,6 +17,8 @@
#
from typing import Union, List, Iterable, Dict, Callable, Set, Any, Tuple, cast, Iterator
import pandas as pd
from memoization import cached
import os.path
import re
......@@ -307,7 +309,7 @@ def _create_column_to_quantity_mapping(section_def: Section):
if isinstance(value, float) and math.isnan(value):
value = None
if isinstance(value, (int, float, str)):
if isinstance(value, (int, float, str, pd.Timestamp)):
value = np.array([value])
if value is not None:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment