🤝 sync with pyexcel-commons

Author: chfw

Diff for: .moban.yml

@@ -2,16 +2,15 @@ configuration:
   configuration_dir: "commons/config"
   template_dir:
   - "commons/templates"
+  - "setupmobans/templates"
   - ".moban.d"
   configuration: pyexcel-sortable.yml
 targets:
   - README.rst: README.rst
   - setup.py: setup.py
   - 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
-  - .travis.yml: travis.yml
-  - .gitignore: .gitignore.jj2
+  - test.sh: test.script.jj2
+  - test.bat: test.script.jj2
+  - .travis.yml: travis.yml.jj2

Diff for: .travis.yml

@@ -3,16 +3,14 @@ language: python
 notifications:
   email: false
 python:
-  - pypy
+  - pypy-5.3.1
   - 3.6
   - 3.5
   - 3.4
   - 3.3
   - 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 flake8==2.6.2; fi
   - if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
       mv min_requirements.txt requirements.txt ;

Diff for: README.rst

@@ -8,14 +8,31 @@ pyexcel-sortable - Let you focus on data, instead of file formats
 .. image:: https://api.travis-ci.org/pyexcel/pyexcel-sortable.svg?branch=master
    :target: http://travis-ci.org/pyexcel/pyexcel-sortable
 
-.. image:: https://codecov.io/github/pyexcel/pyexcel-sortable/coverage.png
-   :target: https://codecov.io/github/pyexcel/pyexcel-sortable
+.. image:: https://codecov.io/gh/pyexcel/pyexcel-sortable/branch/master/graph/badge.svg
+   :target: https://codecov.io/gh/pyexcel/pyexcel-sortable
 
 .. image:: https://img.shields.io/gitter/room/gitterHQ/gitter.svg
    :target: https://gitter.im/pyexcel/Lobby
 
 
+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.
+
 
+
+Introduction
+================================================================================
 **pyexcel-sortable** is inspired by `csvtotable <https://github.com/vividvilla/csvtotable>`_ and
 provides csvtotable functionality to pyexcel family.
 
@@ -49,21 +66,6 @@ or clone it and install it:
 
 
 
-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.
-
-
 Development guide
 ================================================================================
 
@@ -88,9 +90,9 @@ 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.
+    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
@@ -112,6 +114,7 @@ How to update test environment and update documentation
 Additional steps are required:
 
 #. pip install moban
+#. git clone https://github.com/moremoban/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`
 
@@ -132,6 +135,8 @@ Acceptance criteria
 #. 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
 
 

Diff for: pyexcel-sortable.yml

@@ -5,5 +5,5 @@ version: "0.0.1"
 current_version: "0.0.1"
 release: "0.0.1"
 dependencies:
-  - csvtotable >= 1.1.1
+  - excel2table >= 2.2.0
 description: "Transform your csv file or a sheet of your xls, xlsx and ods into a sortable HTML file using csvtotable"

Diff for: requirements.txt

@@ -1 +1 @@
-csvtotable >= 1.1.1
+excel2table >= 2.2.0

Diff for: setup.py

@@ -1,3 +1,4 @@
+import codecs
 try:
     from setuptools import setup, find_packages
 except ImportError:
@@ -18,18 +19,18 @@
     'rtable HTML file using csvtotable' +
     ''
 )
+URL = 'https://github.com/pyexcel/pyexcel-sortable'
+DOWNLOAD_URL = '%s/archive/0.0.1.tar.gz' % URL
+FILES = ['README.rst',  'CHANGELOG.rst']
 KEYWORDS = [
-    'excel',
-    'python',
-    'pyexcel',
+    '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',
@@ -40,7 +41,7 @@
 ]
 
 INSTALL_REQUIRES = [
-    'csvtotable >= 1.1.1',
+    'excel2table >= 2.2.0',
 ]
 
 
@@ -60,7 +61,7 @@ def read_files(*files):
 
 def read(afile):
     """Read a file into setup"""
-    with open(afile, 'r') as opened_file:
+    with codecs.open(afile, 'r', 'utf-8') as opened_file:
         content = filter_out_test_code(opened_file)
         content = "".join(list(content))
         return content
@@ -83,7 +84,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__':
@@ -93,7 +98,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,