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

PR for v.1.0.0-rc3

Author: hcpchris

CHANGES.rst

@@ -1,3 +1,14 @@
+Release 1.0.0-rc3
+=========================================
+
+* Fixed unneeded ``python-dotenv`` import.
+* Suppressed Asana irrelevant deprecation warnings.
+* Suppressed Asana custom ``dict`` population
+  (possibly revisit in a later version).
+* Fixed JavaScript module inclusion logic in Jupyter context.
+
+-----------------
+
 Release 1.0.0-rc2
 =========================================
 

highcharts_gantt/__version__.py

@@ -1 +1 @@
-__version__ = '1.0.0-rc2'
+__version__ = '1.0.0-rc3'

highcharts_gantt/chart.py

@@ -4,7 +4,7 @@
 
 from highcharts_stock.chart import Chart as ChartBase
 
-from highcharts_gantt import constants, errors
+from highcharts_gantt import constants, errors, utility_functions
 from highcharts_gantt.options import (HighchartsOptions, 
                                       HighchartsStockOptions,
                                       HighchartsGanttOptions)
@@ -447,38 +447,6 @@ def from_series(cls, *series, kwargs = None):
 
         instance.add_series(series)
 
-    def display(self, global_options = None):
-        """Display the chart in `Jupyter Labs <https://jupyter.org/>`_ or
-        `Jupyter Notebooks <https://jupyter.org/>`_.
-
-        :raises HighchartsDependencyError: if
-          `ipython <https://ipython.readthedocs.io/en/stable/>`_ is not available in the
-          runtime environment
-        """
-        try:
-            from IPython import display
-        except ImportError:
-            raise errors.HighchartsDependencyError('Unable to import IPython.display. '
-                                                   'Make sure that it is available in '
-                                                   'your runtime environment. To install,'
-                                                   'use: pip install ipython')
-
-        if global_options is not None:
-            global_options = validate_types(global_options,
-                                            types = SharedGanttOptions)
-
-        if self.is_gantt_chart:
-            include_str = constants.GANTT_INCLUDE_STR
-        else:
-            include_str = constants.INCLUDE_STR
-
-        html_str = include_str + '\n'
-        if global_options:
-            html_str += global_options._repr_html_() + '\n'
-        html_str += self._repr_html_()
-
-        display.display_html(html_str, raw = True)
-
     @staticmethod
     def _get_options_obj(series_type, options_kwargs):
         """Return an :class:`Options` descendent based on the series type.

highcharts_gantt/constants.py

@@ -1,20 +1,14 @@
 """Defines a set of constants that are used throughout the library."""
-from highcharts_core.constants import *
+from highcharts_stock.constants import *
 
-
-GANTT_INCLUDE_LIBS = [
+GANTT_INCLUDE_LIBS = [x for x in STOCK_INCLUDE_LIBS]
+GANTT_INCLUDE_LIBS.extend([
     "https://code.highcharts.com/gantt/modules/gantt.js",
-    "https://code.highcharts.com/stock/highcharts-more.js",
-    "https://code.highcharts.com/stock/highcharts-more.src.js",
-    "https://code.highcharts.com/stock/modules/exporting.js",
-    "https://code.highcharts.com/stock/modules/exporting.src.js",
-    "https://code.highcharts.com/stock/modules/drilldown.js",
-    "https://code.highcharts.com/stock/modules/drilldown.src.js",
-    "https://code.highcharts.com/stock/modules/solid-gauge.js",
-    "https://code.highcharts.com/stock/modules/solid-gauge.src.js"
-]
+])
 
-GANTT_INCLUDE_STR = """<script src="https://code.highcharts.com/gantt/modules/gantt.js"></script>"""
+GANTT_INCLUDE_STR = STOCK_INCLUDE_STR + """
+    <script src="https://code.highcharts.com/gantt/modules/gantt.js"/>
+"""
 
 
 MONDAY_TEMPLATES = {

highcharts_gantt/headless_export.py

@@ -1,4 +1,9 @@
-from dotenv import load_dotenv
+try:
+    from dotenv import load_dotenv
+    load_dotenv()
+except ImportError:
+    pass
+
 from typing import Optional
 
 from validator_collection import checkers
@@ -11,7 +16,6 @@
                                                             SharedStockOptions,
                                                             SharedGanttOptions)
 
-load_dotenv()
 
 
 class ExportServer(ExportServerBase):

highcharts_gantt/options/series/data/gantt.py

@@ -431,6 +431,11 @@ def from_array(cls, value):
         """
         if not value:
             return []
+        elif checkers.is_string(value):
+            try:
+                value = validators.json(value)
+            except (ValueError, TypeError):
+                pass
         elif not checkers.is_iterable(value):
             value = [value]
 
@@ -531,7 +536,7 @@ def from_asana(cls,
             dependencies.append(connection)
 
         data_point.dependency = dependencies
-        data_point.custom = task
+        #data_point.custom = task
 
         return data_point
 

highcharts_gantt/options/series/gantt.py

@@ -1,7 +1,12 @@
 import os
 from typing import Optional, List
 
-from dotenv import load_dotenv
+try:
+    from dotenv import load_dotenv
+    load_dotenv()
+except ImportError:
+    pass
+
 from validator_collection import validators, checkers
 
 try:
@@ -24,9 +29,6 @@
 from highcharts_gantt.utility_functions import mro__to_untrimmed_dict
 
 
-load_dotenv()
-
-
 class GanttSeries(SeriesBase, GanttOptions):
     """Options to configure a Gantt series.
 
@@ -309,6 +311,8 @@ def load_from_asana(self,
                                                   'Neither was supplied.')
         else:
             client = asana.Client.access_token(personal_access_token)
+            
+        client.LOG_ASANA_CHANGE_WARNINGS = False
 
         if section_gid:
             request = client.tasks.get_tasks_for_section