🤝 sync with pyexcel-commons and setupmobans. use pyexcel-ezodf

Author: chfw

.moban.yml

@@ -2,6 +2,7 @@ configuration:
   configuration_dir: "commons/config"
   template_dir:
   - "commons/templates"
+  - "setupmobans/templates"
   - ".moban.d"
   configuration: pyexcel_ods3.yaml
 targets:
@@ -10,11 +11,10 @@ targets:
   - "docs/source/conf.py": "docs/source/conf.py.jj2"
   - .travis.yml: travis.yml
   - requirements.txt: requirements.txt
-  - LICENSE: LICENSE.jj2
   - MANIFEST.in: MANIFEST.in.jj2
   - "tests/requirements.txt": "tests/requirements.txt"
-  - test.sh: test.sh.jj2
-  - test.bat: test.sh.jj2
+  - test.sh: test.script.jj2
+  - test.bat: test.script.jj2
   - "tests/test_filter.py": "tests/test_filter.py.jj2"
   - "tests/test_formatters.py": "tests/test_formatters.py"
   - "tests/test_stringio.py": "tests/test_stringio.py.jj2"

.travis.yml

@@ -10,9 +10,6 @@ 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

README.rst

@@ -8,8 +8,11 @@ pyexcel-ods3 - Let you focus on data, instead of ods format
 .. image:: https://api.travis-ci.org/pyexcel/pyexcel-ods3.svg?branch=master
    :target: http://travis-ci.org/pyexcel/pyexcel-ods3
 
-.. image:: https://codecov.io/github/pyexcel/pyexcel-ods3/coverage.png
-   :target: https://codecov.io/github/pyexcel/pyexcel-ods3
+.. image:: https://codecov.io/gh/pyexcel/pyexcel-ods3/branch/master/graph/badge.svg
+   :target: https://codecov.io/gh/pyexcel/pyexcel-ods3
+
+.. image:: https://img.shields.io/gitter/room/gitterHQ/gitter.svg
+   :target: https://gitter.im/pyexcel/Lobby
 
 
 **pyexcel-ods3** is a tiny wrapper library to read, manipulate and write data in ods
@@ -318,19 +321,40 @@ Then install relevant development requirements:
 #. pip install -r requirements.txt
 #. pip install -r tests/requirements.txt
 
+Once you have finished your changes, please provide test case(s), relevant documentation
+and update CHANGELOG.rst.
+
+.. note::
+
+    As to rnd_requirements.txt, usually, it is created when a dependent
+    library is not released. Once the dependecy is installed
+    (will be released), the future
+    version of the dependency in the requirements.txt will be valid.
+
+
+How to test your contribution
+------------------------------
+
+Although `nose` and `doctest` are both used in code testing, it is adviable that unit tests are put in tests. `doctest` is incorporated only to make sure the code examples in documentation remain valid across different development releases.
+
+On Linux/Unix systems, please launch your tests like this::
+
+    $ make
+
+On Windows systems, please issue this command::
 
-In order to update test environment, and documentation, additional steps are
-required:
+    > test.bat
+
+How to update test environment and update documentation
+---------------------------------------------------------
+
+Additional steps are required:
 
 #. pip install moban
+#. git clone https://github.com/pyexcel/setupmobans.git # generic setup
 #. git clone https://github.com/pyexcel/pyexcel-commons.git commons
 #. make your changes in `.moban.d` directory, then issue command `moban`
 
-What is rnd_requirements.txt
--------------------------------
-
-Usually, it is created when a dependent library is not released. Once the dependecy is installed(will be released), the future version of the dependency in the requirements.txt will be valid.
-
 What is pyexcel-commons
 ---------------------------------
 
@@ -341,18 +365,16 @@ What is .moban.d
 
 `.moban.d` stores the specific meta data for the library.
 
-How to test your contribution
-------------------------------
-
-Although `nose` and `doctest` are both used in code testing, it is adviable that unit tests are put in tests. `doctest` is incorporated only to make sure the code examples in documentation remain valid across different development releases.
+Acceptance criteria
+-------------------
 
-On Linux/Unix systems, please launch your tests like this::
-
-    $ make
-
-On Windows systems, please issue this command::
-
-    > test.bat
+#. Has Test cases written
+#. Has all code lines tested
+#. Passes all Travis CI builds
+#. Has fair amount of documentation if your change is complex
+#. Please update CHANGELOG.rst
+#. Please add yourself to CONTRIBUTORS.rst
+#. Agree on NEW BSD License for your contribution
 
 Installation Note
 ================================================================================

docs/source/conf.py

@@ -11,7 +11,7 @@
 ]
 
 intersphinx_mapping = {
-    'pyexcel': ('http://pyexcel.readthedocs.org/en/latest/', None),
+    'pyexcel': ('http://pyexcel.readthedocs.io/en/latest/', None),
 }
 spelling_word_list_filename = 'spelling_wordlist.txt'
 templates_path = ['_templates']
@@ -21,7 +21,7 @@
 project = u'pyexcel-ods3'
 copyright = u'2015-2017 Onni Software Ltd.'
 version = '0.4.0'
-release = '0.4.0'
+release = '0.4.1'
 exclude_patterns = []
 pygments_style = 'sphinx'
 html_theme = 'default'

pyexcel_ods3.yaml

@@ -1,13 +1,14 @@
 overrides: "pyexcel.yaml"
 name: "pyexcel-ods3"
 nick_name: ods3
-version: 0.4.0
+version: 0.4.1
+current_version: 0.4.1
 release: 0.4.0
 file_type: ods
 dependencies:
   - pyexcel-io>=0.4.0
   - lxml
-  - ezodf>=0.3.2
+  - pyexcel-ezodf>=0.3.3
   - weakrefset;python_version<"2.7"
 description: |
   A wrapper library to read, manipulate and write data in ods format

requirements.txt

@@ -1,4 +1,4 @@
 pyexcel-io>=0.4.0
 lxml
-ezodf>=0.3.2
+pyexcel-ezodf>=0.3.3
 weakrefset;python_version<"2.7"

rnd_requirements.txt

@@ -1,4 +1 @@
-https://github.com/chfw/lml/archive/master.zip
-https://github.com/pyexcel/pyexcel-io/archive/master.zip
-https://github.com/pyexcel/pyexcel/archive/master.zip
-https://github.com/pyexcel/pyexcel-xls/archive/master.zip
+https://github.com/pyexcel/pyexcel-ezodf/archive/master.zip

setup.py

@@ -10,26 +10,26 @@
 
 NAME = 'pyexcel-ods3'
 AUTHOR = 'C.W.'
-VERSION = '0.4.0'
-EMAIL = 'wangc_2011 (at) hotmail.com'
+VERSION = '0.4.1'
+EMAIL = 'wangc_2011@hotmail.com'
 LICENSE = 'New BSD'
 DESCRIPTION = (
     'A wrapper library to read, manipulate and write data in ods format' +
     ''
 )
+URL = 'https://github.com/pyexcel/pyexcel-ods3'
+DOWNLOAD_URL = '%s/archive/0.4.0.tar.gz' % URL
+FILES = ['README.rst',  'CHANGELOG.rst']
 KEYWORDS = [
-    'excel',
-    'python',
-    'pyexcel',
     'ods'
+    'python'
 ]
 
 CLASSIFIERS = [
     'Topic :: Office/Business',
     'Topic :: Utilities',
     'Topic :: Software Development :: Libraries',
     'Programming Language :: Python',
-    'License :: OSI Approved :: BSD License',
     'Intended Audience :: Developers',
     'Programming Language :: Python :: 2.6',
     'Programming Language :: Python :: 2.7',
@@ -42,7 +42,7 @@
 INSTALL_REQUIRES = [
     'pyexcel-io>=0.4.0',
     'lxml',
-    'ezodf>=0.3.2',
+    'pyexcel-ezodf>=0.3.3',
 ]
 
 if PY26:
@@ -87,7 +87,11 @@ def filter_out_test_code(file_handle):
                     found_test_code = False
                     yield line
         else:
-            yield line
+            for keyword in ['|version|', '|today|']:
+                if keyword in line:
+                    break
+            else:
+                yield line
 
 
 if __name__ == '__main__':
@@ -97,7 +101,9 @@ def filter_out_test_code(file_handle):
         version=VERSION,
         author_email=EMAIL,
         description=DESCRIPTION,
-        long_description=read_files('README.rst', 'CHANGELOG.rst'),
+        url=URL,
+        download_url=DOWNLOAD_URL,
+        long_description=read_files(*FILES),
         license=LICENSE,
         keywords=KEYWORDS,
         extras_require=EXTRAS_REQUIRE,

tests/test_writer.py

@@ -19,10 +19,10 @@ def test_write_book(self):
         reader = Reader()
         reader.open(self.testfile)
         content = reader.read_all()
-        reader.close()
         for key in content.keys():
             content[key] = list(content[key])
         assert content == self.content
+        reader.close()
 
     def tearDown(self):
         if os.path.exists(self.testfile):