💚 update sortable to use csv2table 2.0.0

chfw · chfw · commit 42b4d7960b5f · 2017-12-11T22:13:03.000Z
diff --git a/.gitignore b/.gitignore
@@ -89,7 +89,11 @@ ENV/
 
 # Rope project settings
 .ropeproject
+
+# emacs
 *~
-commons/
-commons
+
+# moban hashes
 .moban.hashes
+.DS_store
+
diff --git a/.moban.d/travis.yml b/.moban.d/travis.yml
@@ -0,0 +1,11 @@
+{% extends "travis.yml.jj2" %}
+
+{%block custom_python_versions%}
+python:
+  - pypy
+  - 3.6
+  - 3.5
+  - 3.4
+  - 3.3
+  - 2.7
+{%endblock%}
diff --git a/.moban.yml b/.moban.yml
@@ -2,16 +2,17 @@ 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
+  - LICENSE: NEW_BSD_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
   - .travis.yml: travis.yml
-  - .gitignore: .gitignore.jj2
+  - .gitignore: gitignore.jj2
diff --git a/.travis.yml b/.travis.yml
@@ -10,9 +10,6 @@ python:
   - 3.3
   - 2.7
 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 --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,3 @@
 include README.rst
+include LICENSE
 include CHANGELOG.rst
diff --git a/README.rst b/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. 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.
 
@@ -32,7 +49,8 @@ Quick evaluation::
 
 Installation
 ================================================================================
-You can install it via pip:
+
+You can install pyexcel-sortable via pip:
 
 .. code-block:: bash
 
@@ -49,21 +67,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 +91,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 +115,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 +136,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 --git a/notebook.ipynb b/notebook.ipynb
@@ -2,36 +2,45 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": 2,
+   "metadata": {},
    "outputs": [
     {
-     "ename": "TypeError",
-     "evalue": "unorderable types: int() > NoneType()",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[0;31mTypeError\u001b[0m                                 Traceback (most recent call last)",
-      "\u001b[0;32m<ipython-input-1-7ac7233c3511>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[1;32m      1\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mpyexcel\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0mp\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      2\u001b[0m \u001b[0msheet\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mp\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mget_sheet\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mfile_name\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;34m'goog.ods'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 3\u001b[0;31m \u001b[0msheet\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0msave_as\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'me.sortable.html'\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mdisplay_length\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;36m10\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m      4\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0mIPython\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mdisplay\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mIFrame\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m      5\u001b[0m \u001b[0mIFrame\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m\"me.sortable.html\"\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mwidth\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;36m600\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mheight\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;36m500\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
-      "\u001b[0;32m/Users/jaska/github/data-analysis-env/lib/python3.5/site-packages/pyexcel-0.5.3-py3.5.egg/pyexcel/internal/meta.py\u001b[0m in \u001b[0;36msave_as\u001b[0;34m(self, filename, **keywords)\u001b[0m\n\u001b[1;32m    279\u001b[0m         \"\"\"\n\u001b[1;32m    280\u001b[0m         return save_sheet(self, file_name=filename,\n\u001b[0;32m--> 281\u001b[0;31m                           **keywords)\n\u001b[0m\u001b[1;32m    282\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    283\u001b[0m     \u001b[0;32mdef\u001b[0m \u001b[0msave_to_memory\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mself\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mfile_type\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mstream\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;32mNone\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m**\u001b[0m\u001b[0mkeywords\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
-      "\u001b[0;32m/Users/jaska/github/data-analysis-env/lib/python3.5/site-packages/pyexcel-0.5.3-py3.5.egg/pyexcel/internal/core.py\u001b[0m in \u001b[0;36msave_sheet\u001b[0;34m(sheet, **keywords)\u001b[0m\n\u001b[1;32m     41\u001b[0m     \"\"\"\n\u001b[1;32m     42\u001b[0m     \u001b[0ma_source\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mSOURCE\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mget_writable_source\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m**\u001b[0m\u001b[0mkeywords\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 43\u001b[0;31m     \u001b[0;32mreturn\u001b[0m \u001b[0m_save_any\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0ma_source\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0msheet\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m     44\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     45\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n",
-      "\u001b[0;32m/Users/jaska/github/data-analysis-env/lib/python3.5/site-packages/pyexcel-0.5.3-py3.5.egg/pyexcel/internal/core.py\u001b[0m in \u001b[0;36m_save_any\u001b[0;34m(a_source, instance)\u001b[0m\n\u001b[1;32m     53\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     54\u001b[0m \u001b[0;32mdef\u001b[0m \u001b[0m_save_any\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0ma_source\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0minstance\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 55\u001b[0;31m     \u001b[0ma_source\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mwrite_data\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0minstance\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m     56\u001b[0m     \u001b[0;32mtry\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     57\u001b[0m         \u001b[0mcontent_stream\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0ma_source\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mget_content\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
-      "\u001b[0;32m/Users/jaska/github/data-analysis-env/lib/python3.5/site-packages/pyexcel-0.5.3-py3.5.egg/pyexcel/plugins/sources/file_output.py\u001b[0m in \u001b[0;36mwrite_data\u001b[0;34m(self, sheet)\u001b[0m\n\u001b[1;32m     27\u001b[0m     \u001b[0;32mdef\u001b[0m \u001b[0mwrite_data\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mself\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0msheet\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     28\u001b[0m         self._renderer.render_sheet_to_file(self._file_name,\n\u001b[0;32m---> 29\u001b[0;31m                                             sheet, **self._keywords)\n\u001b[0m\u001b[1;32m     30\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     31\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n",
-      "\u001b[0;32m/Users/jaska/github/data-analysis-env/lib/python3.5/site-packages/pyexcel-0.5.3-py3.5.egg/pyexcel/renderer.py\u001b[0m in \u001b[0;36mrender_sheet_to_file\u001b[0;34m(self, file_name, sheet, write_title, **keywords)\u001b[0m\n\u001b[1;32m     83\u001b[0m         \u001b[0;32mwith\u001b[0m \u001b[0mopen\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mfile_name\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mWRITE_FLAG\u001b[0m\u001b[0;34m)\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0moutfile\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     84\u001b[0m             \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mset_output_stream\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0moutfile\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 85\u001b[0;31m             \u001b[0mself\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mrender_sheet\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0msheet\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m**\u001b[0m\u001b[0mkeywords\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m     86\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     87\u001b[0m     def render_sheet_to_stream(self, file_stream, sheet,\n",
-      "\u001b[0;32m/Users/jaska/github/pyexcel-sortable/pyexcel_sortable/sortable.py\u001b[0m in \u001b[0;36mrender_sheet\u001b[0;34m(self, sheet, caption, display_length, **keywords)\u001b[0m\n\u001b[1;32m     23\u001b[0m         html = render_template(\n\u001b[1;32m     24\u001b[0m             \u001b[0msheet\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mcolnames\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0msheet\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0marray\u001b[0m\u001b[0;34m[\u001b[0m\u001b[0;36m1\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m,\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m---> 25\u001b[0;31m             caption=caption, display_length=display_length)\n\u001b[0m\u001b[1;32m     26\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m     27\u001b[0m         \u001b[0mjs_freezed_html\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mfreeze_js\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mhtml\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
-      "\u001b[0;32m/Users/jaska/github/data-analysis-env/lib/python3.5/site-packages/csvtotable/convert.py\u001b[0m in \u001b[0;36mrender_template\u001b[0;34m(table_headers, table_items, **options)\u001b[0m\n\u001b[1;32m    131\u001b[0m     \u001b[0mscroll_y\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mheight\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    132\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m--> 133\u001b[0;31m     \u001b[0;32mif\u001b[0m \u001b[0mvirtual_scroll_limit\u001b[0m \u001b[0;34m!=\u001b[0m \u001b[0;34m-\u001b[0m\u001b[0;36m1\u001b[0m \u001b[0;32mand\u001b[0m \u001b[0mlen\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mtable_items\u001b[0m\u001b[0;34m)\u001b[0m \u001b[0;34m>\u001b[0m \u001b[0mvirtual_scroll_limit\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m    134\u001b[0m         \u001b[0mvirtual_scroll\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0;32mTrue\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m    135\u001b[0m         \u001b[0mdisplay_length\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0;34m-\u001b[0m\u001b[0;36m1\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
-      "\u001b[0;31mTypeError\u001b[0m: unorderable types: int() > NoneType()"
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "WARNING:csvtotable:\n",
+      "Virtual scroll is enabled since number of rows exceeds None. You can set custom row limit by setting flag -vs, --virtual-scroll. Virtual scroll can be disabled by setting the value to -1 and set it to 0 to always enable.\n"
      ]
+    },
+    {
+     "data": {
+      "text/html": [
+       "\n",
+       "        <iframe\n",
+       "            width=\"600\"\n",
+       "            height=\"600\"\n",
+       "            src=\"me.sortable.html\"\n",
+       "            frameborder=\"0\"\n",
+       "            allowfullscreen\n",
+       "        ></iframe>\n",
+       "        "
+      ],
+      "text/plain": [
+       "<IPython.lib.display.IFrame at 0x110da8f90>"
+      ]
+     },
+     "execution_count": 2,
+     "metadata": {},
+     "output_type": "execute_result"
     }
    ],
    "source": [
     "import pyexcel as p\n",
     "sheet = p.get_sheet(file_name='goog.ods')\n",
     "sheet.save_as('me.sortable.html', display_length=10)\n",
     "from IPython.display import IFrame\n",
-    "IFrame(\"me.sortable.html\", width=600, height=500)"
+    "IFrame(\"me.sortable.html\", width=600, height=600)"
    ]
   },
   {
@@ -46,21 +55,21 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 2",
    "language": "python",
-   "name": "python3"
+   "name": "python2"
   },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
-    "version": 3
+    "version": 2
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.5.2"
+   "pygments_lexer": "ipython2",
+   "version": "2.7.10"
   }
  },
  "nbformat": 4,
diff --git a/pyexcel-sortable.yml b/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
+  - csvtotable >= 2.0
 description: "Transform your csv file or a sheet of your xls, xlsx and ods into a sortable HTML file using csvtotable"
diff --git a/pyexcel_sortable/sortable.py b/pyexcel_sortable/sortable.py
@@ -22,7 +22,8 @@ def render_sheet(self, sheet, caption="", display_length=None,
 
         html = render_template(
             sheet.colnames, sheet.array[1:],
-            caption=caption, display_length=display_length)
+            caption=caption, pagination=True, export=False,
+            display_length=display_length)
 
         js_freezed_html = freeze_js(html)
         if PY2:
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-csvtotable >= 1.1.1
+csvtotable >= 2.0
diff --git a/setup.py b/setup.py
diff --git a/test.bat b/test.bat
diff --git a/test.sh b/test.sh

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`include README.rst`
	`2`	`+include LICENSE`
`2`	`3`	`include CHANGELOG.rst`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-csvtotable >= 1.1.1`
	`1`	`+csvtotable >= 2.0`