test latest pyexcel v0.2.2

Author: chfw

.moban.d/travis.yml

@@ -16,7 +16,11 @@ matrix:
       env: DJANGO_VERSION=1.8.2
 {%endblock%}
 
-{%block test_other_python_versions%}  - 3.3
+{%block custom_python_versions%}
+python:
+  - 2.6
+  - 2.7
+  - 3.3
   - 3.4
   - 3.5
 {%endblock%}

.travis.yml

@@ -2,11 +2,11 @@ sudo: false
 language: python
 notifications:
   email: false
-env:
   - DJANGO_VERSION=1.7.8
   - DJANGO_VERSION=1.8.2
   - DJANGO_VERSION=1.9
 python:
+  - 2.6
   - 2.7
   - 3.3
   - 3.4
@@ -19,11 +19,16 @@ matrix:
       env: DJANGO_VERSION=1.7.8
     - python: 3.5
       env: DJANGO_VERSION=1.8.2
-install:
+before_install:
   - pip install Django==$DJANGO_VERSION
-  - pip install -r requirements.txt
+  - if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
+      mv min_requirements.txt requirements.txt ;
+    fi
+  - test ! -f rnd_requirements.txt || 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
 script:
   make test
 after_success:
-  codecov
+  codecov

MANIFEST.in

@@ -1 +1,2 @@
 include README.rst
+include CHANGELOG.rst

README.rst

@@ -49,7 +49,7 @@ The highlighted features are:
    `pyexcel-text`_  (write only)json, rst, mediawiki,
                     latex, grid, pipe, orgtbl, plain simple
    ================ ========================================
-   
+
 .. _pyexcel-xls: https://github.com/pyexcel/pyexcel-xls
 .. _pyexcel-xlsx: https://github.com/pyexcel/pyexcel-xlsx
 .. _pyexcel-ods: https://github.com/pyexcel/pyexcel-ods
@@ -65,10 +65,11 @@ and export from SQL databases, information analysis and persistence. It uses
 #. to provide one-stop utility to import the data in uploaded file into a database and to export tables in a database as excel files for file download.
 #. to provide the same interface for information persistence at server side: saving a uploaded excel file to and loading a saved excel file from file system.
 
+
 Known constraints
 ==================
 
-Fonts, colors and charts are not supported. 
+Fonts, colors and charts are not supported.
 
 Tested Django Versions
 ========================

doc/source/conf.py

@@ -250,4 +250,4 @@
 #texinfo_show_urls = 'footnote'
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
+#texinfo_no_detailmenu = False

doc/source/index.rst

@@ -50,7 +50,7 @@ The highlighted features are:
    `pyexcel-text`_  (write only)json, rst, mediawiki,
                     latex, grid, pipe, orgtbl, plain simple
    ================ ========================================
-   
+
 .. _pyexcel-xls: https://github.com/pyexcel/pyexcel-xls
 .. _pyexcel-xlsx: https://github.com/pyexcel/pyexcel-xlsx
 .. _pyexcel-ods: https://github.com/pyexcel/pyexcel-ods
@@ -66,6 +66,7 @@ and export from SQL databases, information analysis and persistence. It uses
 #. to provide one-stop utility to import the data in uploaded file into a database and to export tables in a database as excel files for file download.
 #. to provide the same interface for information persistence at server side: saving a uploaded excel file to and loading a saved excel file from file system.
 
+
 Installation
 -------------------
 
@@ -102,7 +103,7 @@ You will need to update your *settings.py*::
 
 More excel file formats
 ------------------------
-    
+
 The example application understands csv, tsv and its zipped variants: csvz and tsvz. If you would like to expand the list of supported excel file formats (see :ref:`file-format-list`) for your own application, you could include one or all of the following import lines right after **django-excel** is imported::
 
     import pyexcel.ext.xls # pip install pyexcel-xls
@@ -535,3 +536,4 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
+

sample-data.xls

@@ -5,51 +5,40 @@
     use_setuptools()
     from setuptools import setup, find_packages
 
-with open("README.rst", 'r') as readme:
-    README_txt = readme.read()
+NAME = 'django-excel'
+AUTHOR = 'C.W.'
+VERSION = '0.0.4'
+EMAIL = 'wangc_2011 (at) hotmail.com'
+LICENSE = 'New BSD'
+PACKAGES = find_packages(exclude=['ez_setup', 'examples', 'tests'])
+DESCRIPTION = 'A django middleware that provides one application programming interface to read and write data in different excel file formats'
+KEYWORDS = [
+   'excel',
+   'python',
+   'pyexcel',
+        'API',
+        'Django'
+]
 
-dependencies = [
+INSTALL_REQUIRES = [
     'pyexcel>=0.2.0',
     'pyexcel-webio>=0.0.6',
     'Django>=1.7.1',
 ]
 
-extras = {
+EXTRAS_REQUIRE = {
     'xls': ['pyexcel-xls>=0.1.0'],
     'xlsx': ['pyexcel-xlsx>=0.1.0'],
     'ods': ['pyexcel-ods3>=0.1.0'],
 }
 
-
-setup(
-    name='django-excel',
-    author='C.W.',
-    version='0.0.4',
-    author_email='wangc_2011 (at) hotmail.com',
-    url='https://github.com/pyexcel/django-excel',
-    description='A django middleware that provides one application programming interface to read and write data in different excel file formats',
-    install_requires=dependencies,
-    extras_require=extras,
-    packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
-    include_package_data=True,
-    long_description=README_txt,
-    zip_safe=False,
-    tests_require=['nose'],
-    keywords=[
-        'excel',
-        'python',
-        'pyexcel',
-        'API',
-        'Django'
-    ],
-    license='New BSD',
-    classifiers=[
-        'Topic :: Office/Business',
-        'Topic :: Utilities',
-        'Topic :: Software Development :: Libraries',
-        'Programming Language :: Python',
-        'License :: OSI Approved :: BSD License',
-        'Intended Audience :: Developers',
+CLASSIFIERS = [
+    'Topic :: Office/Business',
+    'Topic :: Utilities',
+    'Topic :: Software Development :: Libraries',
+    'Programming Language :: Python',
+    'License :: OSI Approved :: BSD License',
+    'Intended Audience :: Developers',
         'Development Status :: 3 - Alpha',
         'Environment :: Web Environment',
         'Topic :: Internet :: WWW/HTTP',
@@ -63,5 +52,38 @@
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5'
-    ]
-)
+]
+
+
+def read_files(*files):
+    """Read files into setup"""
+    text = ""
+    for single_file in files:
+        text = text + read(single_file) + "\n"
+    return text
+
+
+def read(afile):
+    """Read a file into setup"""
+    with open(afile, 'r') as opened_file:
+        return opened_file.read()
+
+
+if __name__ == '__main__':
+    setup(
+        name=NAME,
+        author=AUTHOR,
+        version=VERSION,
+        author_email=EMAIL,
+        description=DESCRIPTION,
+        install_requires=INSTALL_REQUIRES,
+        keywords=KEYWORDS,
+        extras_require=EXTRAS_REQUIRE,
+        packages=PACKAGES,
+        include_package_data=True,
+        long_description=read_files('README.rst', 'CHANGELOG.rst'),
+        zip_safe=False,
+        tests_require=['nose'],
+        license=LICENSE,
+        classifiers=CLASSIFIERS
+    )

setup.py

@@ -138,15 +138,15 @@ def testBook(self):
         assert response2.status_code == 200
         book = pe.get_book(file_type='xls', file_content=response2.content)
         content = dedent("""
-        Sheet Name: question
+        question:
         +----+---------------------------+----------------------------------------------+----------+
         | id | pub_date                  | question_text                                | slug     |
         +----+---------------------------+----------------------------------------------+----------+
         | 1  | 2015-01-28T00:00:00+00:00 | What is your favourite programming language? | language |
         +----+---------------------------+----------------------------------------------+----------+
         | 2  | 2015-01-29T00:00:00+00:00 | What is your favourite IDE?                  | ide      |
         +----+---------------------------+----------------------------------------------+----------+
-        Sheet Name: choice
+        choice:
         +---------------+----+-------------+-------+
         | choice_text   | id | question_id | votes |
         +---------------+----+-------------+-------+
@@ -164,7 +164,7 @@ def testBook(self):
         +---------------+----+-------------+-------+
         | IntelliJ      | 7  | 2           | 0     |
         +---------------+----+-------------+-------+""").strip('\n')
-        assert str(book) == content
+        self.assertEqual(str(book), content)
 
     def testSheet(self):
         fp = open(self.testfile, "rb")
@@ -174,7 +174,7 @@ def testSheet(self):
         assert response2.status_code == 200
         sheet = pe.get_sheet(file_type='xls', file_content=response2.content)
         content = dedent("""
-        Sheet Name: question
+        question:
         +----+---------------------------+----------------------------------------------+----------+
         | id | pub_date                  | question_text                                | slug     |
         +----+---------------------------+----------------------------------------------+----------+
@@ -192,15 +192,15 @@ def testImportSheet(self):
         assert response2.status_code == 200
         sheet = pe.get_sheet(file_type='xls', file_content=response2.content)
         content = dedent("""
-        Sheet Name: question
+        question:
         +----+---------------------------+----------------------------------------------+----------+
         | id | pub_date                  | question_text                                | slug     |
         +----+---------------------------+----------------------------------------------+----------+
         | 1  | 2015-01-28T00:00:00+00:00 | What is your favourite programming language? | language |
         +----+---------------------------+----------------------------------------------+----------+
         | 2  | 2015-01-29T00:00:00+00:00 | What is your favourite IDE?                  | ide      |
         +----+---------------------------+----------------------------------------------+----------+""").strip('\n')
-        assert str(sheet) == content
+        self.assertEqual(str(sheet), content)
 
     def testCustomExport(self):
         fp = open(self.testfile, "rb")
@@ -210,7 +210,7 @@ def testCustomExport(self):
         assert response2.status_code == 200
         sheet = pe.get_sheet(file_type='xls', file_content=response2.content)
         content = dedent("""
-        Sheet Name: pyexcel_sheet1
+        pyexcel_sheet1:
         +---------------+----+-------+
         | choice_text   | id | votes |
         +---------------+----+-------+
@@ -222,7 +222,7 @@ def testCustomExport(self):
         +---------------+----+-------+
         | IntelliJ      | 7  | 0     |
         +---------------+----+-------+""").strip('\n')
-        assert str(sheet) == content
+        self.assertEqual(str(sheet), content)
 
 
 @override_settings(FILE_UPLOAD_MAX_MEMORY_SIZE=1)

testResponse.py

@@ -1,6 +1,4 @@
 nose
-rednose
-nose-cov
 codecov
 coverage
 lxml