Skip to content

Commit 4370e05

Browse files
authored
Merge pull request #70 from highcharts-for-python/develop
PR for v.1.2.5
2 parents 155c159 + 9f60168 commit 4370e05

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

CHANGES.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
Release 1.2.5
2+
=========================================
3+
4+
* **BUGFIX:** Fixed ``ExportServer`` handling of data relying on Pandas ``Timestamp`` instances.
5+
6+
------------------
7+
18
Release 1.2.4
29
=========================================
310

highcharts_core/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.2.4'
1+
__version__ = '1.2.5'

highcharts_core/metaclasses.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""Set of metaclasses used throughout the library."""
2+
import datetime
23
from abc import ABC, abstractmethod
34
from collections import UserDict
45
from typing import Optional, List
@@ -244,6 +245,9 @@ def trim_dict(untrimmed: dict,
244245
trimmed_value = HighchartsMeta.trim_iterable(value, to_json = to_json)
245246
if trimmed_value:
246247
as_dict[key] = trimmed_value
248+
# Pandas Timestamp
249+
elif checkers.is_type(value, 'Timestamp'):
250+
as_dict[key] = value.timestamp()
247251
# other truthy -> str / number
248252
elif value:
249253
trimmed_value = HighchartsMeta.trim_iterable(value, to_json = to_json)

0 commit comments

Comments
 (0)