making pyexcel-chart as interface plugin

Author: chfw

.moban.d/tests/requirements.txt

@@ -1,4 +1,5 @@
 {% extends 'tests/requirements.txt.jj2' %}
 {%block extras %}
 pyexcel
+pyexcel-pygal
 {%endblock%}

.travis.yml

@@ -3,19 +3,18 @@ language: python
 notifications:
   email: false
 python:
+  - pypy
   - 3.6
   - 3.5
   - 3.4
   - 3.3
   - 2.7
   - 2.6
-  - pypy
 before_install:
   - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
   - if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
       mv min_requirements.txt requirements.txt ;
     fi
-  - pip install --upgrade setuptools "pip==7.1"
   - test ! -f rnd_requirements.txt || pip install --no-deps -r rnd_requirements.txt
   - test ! -f rnd_requirements.txt || pip install -r rnd_requirements.txt ;
   - pip install -r tests/requirements.txt

docs/source/conf.py

@@ -11,12 +11,11 @@
     'sphinx.ext.doctest',
     'sphinx.ext.intersphinx',
     'sphinx.ext.viewcode',
-    'pyexcel_sphinx_integration',
-    'sphinxcontrib.excel'
+    'pyexcel_sphinx_integration'
 ]
 
 intersphinx_mapping = {
-    'pyexcel': ('http://pyexcel.readthedocs.org/en/latest/', None)
+    'pyexcel': ('http://pyexcel.readthedocs.org/en/latest/', None),
 }
 spelling_word_list_filename = 'spelling_wordlist.txt'
 templates_path = ['_templates']

docs/source/index.rst

@@ -1,12 +1,6 @@
 `pyexcel-chart` - Let you focus on data, instead of file formats
 ================================================================================
 
-.. note::
-
-   It is still under writing. My effort is spent elsewhere. Please star this
-   project to show your interest
-
-
 :Author: C.W.
 :Source code: http://github.com/pyexcel/pyexcel-chart.git
 :Issues: http://github.com/pyexcel/pyexcel-chart/issues
@@ -45,4 +39,4 @@ Content
 .. toctree::
 
   charts
-  usage
+  usage

pyexcel_chart.yml

@@ -5,7 +5,5 @@ version: 0.0.1
 release: 0.0.1
 file_type: xls
 dependencies:
-  - pyexcel>=0.3.4
-  - pygal>=2.2.3
-  - six
+  - pyexcel>=0.5.0
 description: A wrapper library of pygal to visualize pyexcel data

pyexcel_chart/chart.py

@@ -8,29 +8,15 @@
     :license: New BSD License, see LICENSE for further details
 """
 import sys
-import pygal
 from functools import partial
 
-from lml.plugin import PluginInfo, PluginManager
-
 from pyexcel.renderer import Renderer
+from lml.plugin import PluginManager
 
 
 PY2 = sys.version_info[0] == 2
-DEFAULT_TITLE = 'pyexcel chart rendered by pygal'
-KEYWORD_CHART_TYPE = 'chart_type'
+DEFAULT_TITLE = 'pyexce-chart renders'
 DEFAULT_CHART_TYPE = 'bar'
-CHART_TYPES = dict(
-    pie='Pie',
-    box='Box',
-    line='Line',
-    bar='Bar',
-    stacked_bar='StackedBar',
-    radar='Radar',
-    dot='Dot',
-    funnel='Funnel',
-    xy='XY',
-    histogram='Histogram')
 
 
 if PY2:
@@ -39,119 +25,6 @@
     from io import BytesIO
 
 
-class Chart(object):
-
-    def __init__(self, cls_name):
-        self._chart_class = CHART_TYPES.get(cls_name, 'line')
-
-
-@PluginInfo('chart', tags=['pie', 'box'])
-class SimpleLayout(Chart):
-
-    def render_sheet(self, sheet, title=DEFAULT_TITLE,
-                     label_y_in_row=0,
-                     **keywords):
-        params = {}
-        self.params = {}
-        if len(sheet.colnames) == 0:
-            sheet.name_columns_by_row(label_y_in_row)
-        params.update(keywords)
-        the_dict = sheet.to_dict()
-        cls = getattr(pygal, self._chart_class)
-        instance = cls(title=title, **params)
-        for key in the_dict:
-            data_array = [value for value in the_dict[key] if value != '']
-            instance.add(key, data_array)
-        chart_content = instance.render()
-        return chart_content
-
-
-@PluginInfo('chart',
-          tags=['line', 'bar', 'stacked_bar', 'radar', 'dot', 'funnel'])
-class ComplexLayout(Chart):
-
-    def render_sheet(self, sheet, title=DEFAULT_TITLE,
-                     label_x_in_column=0, label_y_in_row=0,
-                     **keywords):
-        params = {}
-        self.params = {}
-        if len(sheet.colnames) == 0:
-            sheet.name_columns_by_row(label_y_in_row)
-        if len(sheet.rownames) == 0:
-            sheet.name_rows_by_column(label_x_in_column)
-        params['x_labels'] = sheet.rownames
-        params.update(keywords)
-        the_dict = sheet.to_dict()
-        cls = getattr(pygal, self._chart_class)
-        instance = cls(title=title, **params)
-        for key in the_dict:
-            data_array = [value for value in the_dict[key] if value != '']
-            instance.add(key, data_array)
-        chart_content = instance.render()
-        return chart_content
-
-
-@PluginInfo('chart', tags=['histogram'])
-class Histogram(Chart):
-    def render_sheet(self, sheet, title=DEFAULT_TITLE,
-                     height_in_column=0, start_in_column=1,
-                     stop_in_column=2,
-                     **keywords):
-        histograms = zip(sheet.column[height_in_column],
-                         sheet.column[start_in_column],
-                         sheet.column[stop_in_column])
-        cls = getattr(pygal, self._chart_class)
-        instance = cls(title=title, **keywords)
-        instance.add(sheet.name, histograms)
-        chart_content = instance.render()
-        return chart_content
-
-    def render_book(self, book, title=DEFAULT_TITLE,
-                    height_in_column=0, start_in_column=1,
-                    stop_in_column=2,
-                    **keywords):
-        from pyexcel.book import to_book
-        cls = getattr(pygal, self._chart_class)
-        instance = cls(title=title, **keywords)
-        for sheet in to_book(book):
-            histograms = zip(sheet.column[height_in_column],
-                             sheet.column[start_in_column],
-                             sheet.column[stop_in_column])
-            instance.add(sheet.name, histograms)
-        chart_content = instance.render()
-        return chart_content
-
-
-@PluginInfo('chart', tags=['xy'])
-class XY(Chart):
-
-    def render_sheet(self, sheet, title=DEFAULT_TITLE,
-                     x_in_column=0,
-                     y_in_column=1,
-                     **keywords):
-        cls = getattr(pygal, self._chart_class)
-        instance = cls(title=title, **keywords)
-        points = zip(sheet.column[x_in_column],
-                     sheet.column[y_in_column])
-        instance.add(sheet.name, points)
-        chart_content = instance.render()
-        return chart_content
-
-    def render_book(self, book, title=DEFAULT_TITLE,
-                    x_in_column=0,
-                    y_in_column=1,
-                    **keywords):
-        from pyexcel.book import to_book
-        cls = getattr(pygal, self._chart_class)
-        instance = cls(title=title, **keywords)
-        for sheet in to_book(book):
-            points = zip(sheet.column[x_in_column],
-                         sheet.column[y_in_column])
-            instance.add(sheet.name, points)
-        chart_content = instance.render()
-        return chart_content
-
-
 class ChartManager(PluginManager):
     def __init__(self):
         PluginManager.__init__(self, 'chart')
@@ -164,8 +37,10 @@ def get_a_plugin(self, key, **keywords):
     def raise_exception(self, key):
         raise Exception("No support for " + key)
 
+
 MANAGER = ChartManager()
 
+
 class ChartRenderer(Renderer):
 
     def __init__(self, file_type):

pyexcel_chart/plugin.py

@@ -0,0 +1,7 @@
+from lml.plugin import PluginInfoChain
+
+
+class ChartPluginChain(PluginInfoChain):
+    def add_a_plugin(self, submodule=None, **keywords):
+        return PluginInfoChain.add_a_plugin(
+            self, 'chart', submodule=submodule, **keywords)

requirements.txt

@@ -1,3 +1 @@
-pyexcel>=0.3.4
-pygal>=2.2.3
-six
+pyexcel>=0.5.0

rnd_requirements.txt

@@ -1,3 +1,4 @@
 https://github.com/chfw/lml/archive/master.zip
 https://github.com/pyexcel/pyexcel-io/archive/v0.4.x.zip
 https://github.com/pyexcel/pyexcel/archive/master.zip
+https://github.com/pyexcel/pyexcel-pygal/archive/master.zip

setup.py

@@ -42,9 +42,7 @@
 ]
 
 INSTALL_REQUIRES = [
-    'pyexcel>=0.3.4',
-    'pygal>=2.2.3',
-    'six',
+    'pyexcel>=0.5.0',
 ]
 
 

tests/requirements.txt

@@ -1,5 +1,7 @@
 nose
+mock;python_version<"3"
 codecov
 coverage
 flake8
 pyexcel
+pyexcel-pygal