Merge pull request #120 from highcharts-for-python/develop

PR for v.1.4.1

Author: hcpchris

CHANGES.rst

@@ -1,4 +1,11 @@
 
+Release 1.4.1
+=========================================
+
+* **BUGFIX:** Fixed handling of ``numpy.datetime64`` values in ``DataPointCollection``. (#118)
+
+---------------------
+
 Release 1.4.0
 =========================================
 

docs/using.rst

@@ -783,12 +783,26 @@ will display the chart in full.
 
 .. warning::
 
-  The current version of **Highcharts for Python** assumes that your web content already
-  has all the ``<script/>`` tags which include the
-  `Highcharts (JS) <https://www.highcharts.com>`__ modules your chart relies on.
+  The :meth:`.to_js_literal() <highcharts_core.chart.Chart.to_js_literal>` method 
+  assumes that your web content already has all the ``<script/>`` tags which include 
+  the `Highcharts (JS) <https://www.highcharts.com>`__ modules your chart relies on.
 
-  This is likely to change in a future version of **Highcharts for Python**, where the
-  library will support the production of ``<script/>`` tags (see roadmap issue :issue:`12`).
+  If you need to generate the required ``<script/>`` tags for your chart, you can do
+  so by calling:
+
+    .. code-block:: python
+
+      # EXAMPLE 1.
+      # Get a list of <script/> tags.
+      list_of_script_tags = my_chart.get_script_tags()
+
+      # EXAMPLE 2.
+      # Get a string of <script/> tags.
+      script_tags_as_str = my_chart.get_script_tags(as_str = True)
+
+      # EXAMPLE 3.
+      # Get a list of the required Highcharts modules.
+      required_modules = my_chart.get_required_modules()
 
 For example:
 

highcharts_core/__version__.py

@@ -1 +1 @@
-__version__ = '1.4.0'
+__version__ = '1.4.1'

highcharts_core/options/series/data/collections.py

@@ -1,3 +1,4 @@
+import datetime
 from typing import Optional, List
 from collections import UserDict
 
@@ -273,7 +274,18 @@ def __setattr__(self, name, value):
                     try:
                         setattr(data_points[index], name, value[index])
                     except validator_errors.CannotCoerceError:
-                        if isinstance(value[index], str) and ',' in value[index]:
+                        if 'datetime64' in value[index].__class__.__name__:
+                            try:
+                                coerced_value = value[index].astype(datetime.datetime)
+                                IS_DATETIME = True
+                            except (ValueError, TypeError):
+                                IS_DATETIME = False
+                        else:
+                            IS_DATETIME = False
+                            
+                        if IS_DATETIME:
+                            setattr(data_points[index], name, coerced_value)
+                        elif isinstance(value[index], str) and ',' in value[index]:
                             coerced_value = value[index].replace(',', '')
                             setattr(data_points[index], name, coerced_value)
                         elif checkers.is_numeric(value[index]) or (

requirements.dev.numpy.txt

@@ -10,7 +10,6 @@ sphinx-toolbox==3.4.0
 sphinx-tabs==3.4.1
 tox==4.4.6
 requests==2.31.0
-urllib3==1.26.9
 validator-collection==1.5.0
 anthropic==0.3.11
 dill==0.3.7

requirements.dev.txt

@@ -10,7 +10,6 @@ sphinx-toolbox==3.4.0
 sphinx-tabs==3.4.1
 tox==4.4.6
 requests==2.31.0
-urllib3==1.26.9
 validator-collection==1.5.0
 anthropic==0.3.11
 dill==0.3.7

tests/options/series/test_area.py

@@ -3116,6 +3116,31 @@ def test_LineSeries_from_csv(input_files, filename, property_map, kwargs, expect
                                    **kwargs)
 
 
+def test_Bugfix118_LineSeries_from_pandas_with_datetime():
+    import datetime as dt
+    try:
+        import pandas as pd
+        HAS_PANDAS = True
+    except ImportError:
+        HAS_PANDAS = False
+
+    if HAS_PANDAS:
+        # Generate timestamps for the first 5 days of October 2023
+        start_date = dt.datetime(2023, 10, 1)
+        end_date = dt.datetime(2023, 10, 5)
+        date_range = [start_date + dt.timedelta(days=i) for i in range(5)]
+
+        # Create a list of values
+        values = [10, 20, 30, 40, 50]
+
+        # Create a DataFrame
+        df = pd.DataFrame({'Timestamp': date_range, 'Value': values})
+        my_series = cls5.from_pandas(df, property_map={"x": "Timestamp", "y": "Value"})
+
+        assert my_series is not None
+        assert isinstance(my_series, cls5)
+
+
 #### NEXT CLASS
 
 @pytest.mark.parametrize('kwargs, error', STANDARD_PARAMS)