Skip to content

Commit 8e55fdf

Browse files
authored
Merge pull request #62 from highcharts-for-python/develop
PR for v.1.2.1
2 parents d578534 + 4fe4116 commit 8e55fdf

File tree

6 files changed

+19
-6
lines changed

6 files changed

+19
-6
lines changed

CHANGES.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
Release 1.2.1
2+
=========================================
3+
4+
* **ENHANCEMENT:** Added autoconversion of ``plotLine.value`` from ``datetime.datetime`` to POSIX timestamp (#58).
5+
* **BUGFIX:** Fixed incorrect ``datetime`` serialization to SECONDS from Unix epoch. Now serializing to JS-compatible MILLISECONDS from Unix epoch (#61).
6+
7+
------------------
8+
19
Release 1.2.0
210
=========================================
311

@@ -25,6 +33,8 @@ Release 1.1.1
2533
* **FIXED:** Problem when producing a JS literal, with the JS code inserting an unnecessary ``new`` (#42 and #43).
2634
* **ENHANCEMENT:** Added more elegant error handling when something goes wrong displaying a chart in Jupyter (#43).
2735

36+
-------------
37+
2838
Release 1.1.0
2939
=========================================
3040

highcharts_core/__version__.py

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

highcharts_core/js_literal_functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def serialize_to_js_literal(item, encoding = 'utf-8') -> Optional[str]:
4949
elif checkers.is_datetime(item):
5050
if not item.tzinfo:
5151
item = item.replace(tzinfo = datetime.timezone.utc)
52-
return item.timestamp()
52+
return item.timestamp()*1000
5353
elif checkers.is_date(item):
5454
return f'Date.UTC({item.year}, {item.month - 1}, {item.day})'
5555
elif checkers.is_time(item):

highcharts_core/options/axes/plot_bands.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,9 @@ def value(self) -> Optional[int | float | Decimal]:
349349

350350
@value.setter
351351
def value(self, value):
352+
if hasattr(value, 'timestamp'):
353+
value = value.timestamp() * 1000
354+
352355
self._value = validators.numeric(value, allow_empty = True)
353356

354357
@property

highcharts_core/options/plot_options/series.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -797,10 +797,10 @@ def point_start(self, value):
797797
value = validators.datetime(value)
798798

799799
if hasattr(value, 'timestamp') and value.tzinfo is not None:
800-
self._point_start = value.timestamp()
800+
self._point_start = value.timestamp()*1000
801801
elif hasattr(value, 'timestamp'):
802802
value = value.replace(tzinfo = datetime.timezone.utc)
803-
value = value.timestamp()
803+
value = value.timestamp()*1000
804804
else:
805805
raise error
806806

highcharts_core/options/plot_options/treegraph.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,10 +491,10 @@ def point_start(self, value):
491491
value = validators.datetime(value)
492492

493493
if hasattr(value, 'timestamp') and value.tzinfo is not None:
494-
self._point_start = value.timestamp()
494+
self._point_start = value.timestamp()*1000
495495
elif hasattr(value, 'timestamp'):
496496
value = value.replace(tzinfo = datetime.timezone.utc)
497-
value = value.timestamp()
497+
value = value.timestamp()*1000
498498
else:
499499
raise error
500500

0 commit comments

Comments
 (0)