make v0.4.x as master branch

Author: chfw

.moban.d/README.rst

@@ -1,5 +1,9 @@
 {%extends 'README.rst.jj2' %}
 
+
+{%block documentation_link%}
+{%endblock%}
+
 {%block description%}
 **pyexcel-ods3** is a tiny wrapper library to read, manipulate and write data in ods
 format. You are likely to use `pyexcel <https://github.com/pyexcel/pyexcel>`__ together

.moban.d/tests/requirements.txt

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

.travis.yml

@@ -10,13 +10,15 @@ python:
   - 2.7
   - 2.6
 before_install:
+  - cd $HOME
+  - "if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then deactivate && wget https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.7.1-linux_x86_64-portable.tar.bz2 -O - | tar -jxf - && echo 'Setting up aliases...' && ln -s pypy-5.7.1-linux_x86_64-portable pypy2-latest && export PATH=$HOME/pypy2-latest/bin/:$PATH && virtualenv --no-site-packages --python ~/pypy2-latest/bin/pypy pypy2-env && echo 'Creating custom env...' && source pypy2-env/bin/activate && python -V; fi"
+  - cd -
   - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi
   - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install weakrefset; fi
   - 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

README.rst

@@ -11,8 +11,6 @@ pyexcel-ods3 - Let you focus on data, instead of ods format
 .. image:: https://codecov.io/github/pyexcel/pyexcel-ods3/coverage.png
    :target: https://codecov.io/github/pyexcel/pyexcel-ods3
 
-.. image:: https://readthedocs.org/projects/pyexcel-ods3/badge/?version=latest
-   :target: http://pyexcel-ods3.readthedocs.org/en/latest/
 
 **pyexcel-ods3** is a tiny wrapper library to read, manipulate and write data in ods
 format. You are likely to use `pyexcel <https://github.com/pyexcel/pyexcel>`__ together
@@ -40,10 +38,25 @@ or clone it and install it:
 
 .. code-block:: bash
 
-    $ git clone http://github.com/pyexcel/pyexcel-ods3.git
+    $ git clone https://github.com/pyexcel/pyexcel-ods3.git
     $ cd pyexcel-ods3
     $ python setup.py install
 
+Support the project
+================================================================================
+
+If your company has embedded pyexcel and its components into a revenue generating
+product, please `support me on patreon <https://www.patreon.com/bePatron?u=5537627>`_ to
+maintain the project and develop it further.
+
+If you are an individual, you are welcome to support me too on patreon and for however long
+you feel like to. As a patreon, you will receive
+`early access to pyexcel related contents <https://www.patreon.com/pyexcel/posts>`_.
+
+With your financial support, I will be able to invest
+a little bit more time in coding, documentation and writing interesting posts.
+
+
 Usage
 ================================================================================
 
@@ -351,9 +364,3 @@ The installation of `lxml` will be tricky on Windows platform. It is recommended
    >>> import os
    >>> os.unlink("your_file.ods")
    >>> os.unlink("another_file.ods")
-
-Support the project
-================================================================================
-
-If your company has embedded pyexcel and its components into a revenue generating
-product, please `support me on patreon <https://www.patreon.com/pyexcel>`_.

docs/source/conf.py

@@ -11,7 +11,7 @@
 ]
 
 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']
@@ -20,8 +20,8 @@
 
 project = u'pyexcel-ods3'
 copyright = u'2015-2017 Onni Software Ltd.'
-version = '0.3.2'
-release = '0.3.2'
+version = '0.4.0'
+release = '0.4.0'
 exclude_patterns = []
 pygments_style = 'sphinx'
 html_theme = 'default'

pyexcel_ods3.yaml

@@ -1,11 +1,11 @@
 overrides: "pyexcel.yaml"
 name: "pyexcel-ods3"
 nick_name: ods3
-version: 0.3.2
-release: 0.3.2
+version: 0.4.0
+release: 0.4.0
 file_type: ods
 dependencies:
-  - pyexcel-io>=0.3.0
+  - pyexcel-io>=0.4.0
   - lxml
   - ezodf>=0.3.2
   - weakrefset;python_version<"2.7"

pyexcel_ods3/__init__.py

@@ -10,17 +10,20 @@
 # flake8: noqa
 # this line has to be place above all else
 # because of dynamic import
-__FILE_TYPE__ = 'ods'
-__META__ = {
-    'submodule': __FILE_TYPE__,
-    'file_types': [__FILE_TYPE__],
-    'stream_type': 'binary'
-}
-__pyexcel_io_plugins__ = [__META__]
-
-
+from pyexcel_io.plugins import IOPluginInfoChain
 from pyexcel_io.io import get_data as read_data, isstream, store_data as write_data
 
+__FILE_TYPE__ = 'ods'
+IOPluginInfoChain(__name__).add_a_reader(
+    relative_plugin_class_path='odsr.ODSBook',
+    file_types=[__FILE_TYPE__],
+    stream_type='binary'
+).add_a_writer(
+    relative_plugin_class_path='odsw.ODSWriter',
+    file_types=[__FILE_TYPE__],
+    stream_type='binary'
+)
+
 
 def save_data(afile, data, file_type=None, **keywords):
     """standalone module function for writing module supported file type"""

pyexcel_ods3/ods.py renamed to pyexcel_ods3/odsr.py

@@ -1,27 +1,21 @@
 """
-    pyexcel_ods3.ods
+    pyexcel_ods3.odsr
     ~~~~~~~~~~~~~~~~~~~
 
-    ODS format plugin for pyexcel
+    ods reader
 
     :copyright: (c)  2015-2017 by Onni Software Ltd. & its contributors
     :license: New BSD License
 """
-import sys
 import math
-import types
 
 import ezodf
-from pyexcel_io.book import BookReader, BookWriter
-from pyexcel_io.sheet import SheetReader, SheetWriter
 
-import pyexcel_ods3.converter as converter
+from pyexcel_io.sheet import SheetReader
+from pyexcel_io.book import BookReader
+from pyexcel_io._compact import OrderedDict
 
-PY27_BELOW = sys.version_info[0] == 2 and sys.version_info[1] < 7
-if PY27_BELOW:
-    from ordereddict import OrderedDict
-else:
-    from collections import OrderedDict
+import pyexcel_ods3.converter as converter
 
 
 class ODSSheet(SheetReader):
@@ -73,7 +67,6 @@ def cell_value(self, row, column):
 
 class ODSBook(BookReader):
     """read a ods book out"""
-
     def open(self, file_name, **keywords):
         """load ods from file"""
         BookReader.open(self, file_name, **keywords)
@@ -103,8 +96,8 @@ def read_sheet_by_index(self, sheet_index):
         if sheet_index < length:
             return self.read_sheet(sheets[sheet_index])
         else:
-            raise IndexError("Index %d of out bound %d." % (sheet_index,
-                                                            length))
+            raise IndexError("Index %d of out bound %d." % (
+                sheet_index, length))
 
     def read_all(self):
         """read all available sheets"""
@@ -118,110 +111,16 @@ def read_sheet(self, native_sheet):
         sheet = ODSSheet(native_sheet, **self._keywords)
         return {native_sheet.name: sheet.to_array()}
 
+    def close(self):
+        self._native_book = None
+
     def _load_from_file(self):
         self._native_book = ezodf.opendoc(self._file_name)
 
     def _load_from_memory(self):
         self._native_book = ezodf.opendoc(self._file_stream)
 
 
-class ODSSheetWriter(SheetWriter):
-    """
-    ODS sheet writer
-    """
-    def set_sheet_name(self, name):
-        self._native_sheet = ezodf.Sheet(name)
-        self.current_row = 0
-
-    def set_size(self, size):
-        self._native_sheet.reset(size=size)
-
-    def write_row(self, array):
-        """
-        write a row into the file
-        """
-        count = 0
-        for cell in array:
-            value_type = converter.ODS_WRITE_FORMAT_COVERSION[type(cell)]
-            if value_type == "time":
-                cell = cell.strftime("PT%HH%MM%SS")
-            elif value_type == "timedelta":
-                hours = cell.days * 24 + cell.seconds // 3600
-                minutes = (cell.seconds // 60) % 60
-                seconds = cell.seconds % 60
-                cell = "PT%02dH%02dM%02dS" % (hours, minutes, seconds)
-                value_type = "time"
-            self._native_sheet[self.current_row, count].set_value(
-                cell,
-                value_type=value_type)
-            count += 1
-        self.current_row += 1
-
-    def write_array(self, table):
-        to_write_data = table
-        if isinstance(to_write_data, types.GeneratorType):
-            to_write_data = list(table)
-        rows = len(to_write_data)
-        if rows < 1:
-            return
-        columns = max([len(row) for row in to_write_data])
-        self.set_size((rows, columns))
-        for row in to_write_data:
-            self.write_row(row)
-
-    def close(self):
-        """
-        This call writes file
-
-        """
-        self._native_book.sheets += self._native_sheet
-
-
-class ODSWriter(BookWriter):
-    """
-    open document spreadsheet writer
-
-    """
-    def __init__(self):
-        BookWriter.__init__(self)
-        self._native_book = None
-
-    def open(self, file_name, **keywords):
-        """open a file for writing ods"""
-        BookWriter.open(self, file_name, **keywords)
-        self._native_book = ezodf.newdoc(
-            doctype="ods", filename=self._file_alike_object)
-
-        skip_backup_flag = self._keywords.get('skip_backup', True)
-        if skip_backup_flag:
-            self._native_book.backup = False
-
-    def create_sheet(self, name):
-        """
-        write a row into the file
-        """
-        return ODSSheetWriter(self._native_book, None, name)
-
-    def close(self):
-        """
-        This call writes file
-
-        """
-        self._native_book.save()
-
-
 def is_integer_ok_for_xl_float(value):
     """check if a float had zero value in digits"""
     return value == math.floor(value)
-
-
-_ods_registry = {
-    "file_type": "ods",
-    "reader": ODSBook,
-    "writer": ODSWriter,
-    "stream_type": "binary",
-    "mime_type": "application/vnd.oasis.opendocument.spreadsheet",
-    "library": "pyexcel-ods3"
-}
-
-exports = (_ods_registry, )