Skip to content

Commit 6b4d891

Browse files
committed
documentation update
1 parent e4bf9fd commit 6b4d891

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

README.rst

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ django-excel - Let you focus on data, instead of file formats
2323
.. image:: http://img.shields.io/gittip/chfw.svg
2424
:target: https://gratipay.com/chfw/
2525

26-
**django-excel** is based on `pyexcel <https://github.com/chfw/pyexcel>`_ and makes it easy to consume/produce information stored in excel files over HTTP protocol as well as on file system. This library can turn the excel data into Pythonic a list of lists, a list of records(dictionaries), dictionaries of lists. And vice versa. Hence it lets you focus on data in Flask based web development, instead of file formats.
26+
**django-excel** is based on `pyexcel <https://github.com/chfw/pyexcel>`_ and makes it easy to consume/produce information stored in excel files over HTTP protocol as well as on file system. This library can turn the excel data into Pythonic a list of lists, a list of records(dictionaries), dictionaries of lists. And vice versa. Hence it lets you focus on data in Django web development, instead of file formats.
2727

2828
The idea originated from the problem of the illiteracy of excel file formats of non-technical office workers: such as office assistant, human resource administrator. There is nothing with the un-deniable fact that some people do not know the difference among various excel formats. It becomes usability problem to those people when a web service cannot parse the excel file that they saved using Microsoft Excel. Instead of training those people about file formats, this library helps web developers to handle most of the excel file formats by unifying the programming interface to most of the excel readers and writers.
2929

@@ -63,6 +63,7 @@ Installation
6363
============
6464
You can install it from github only for now::
6565

66+
$ pip install git+https://github.com/chfw/pyexcel.git # pyexcel v0.1.3 is not released yet
6667
$ git clone http://github.com/chfw/django-pyexcel.git
6768
$ cd django-excel
6869
$ python setup.py install
@@ -114,5 +115,5 @@ Dependencies
114115
=============
115116

116117
* Django
117-
* pyexcel
118+
* pyexcel >= 0.1.3
118119
* pyexcel-webio

doc/source/index.rst

+13-10
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Welcome to django-excel's documentation!
1313
:Version: |version|
1414
:Generated: |today|
1515

16-
**django-excel** is based on `pyexcel <https://github.com/chfw/pyexcel>`_ and makes it easy to consume/produce information stored in excel files over HTTP protocol as well as on file system. This library can turn the excel data into Pythonic a list of lists, a list of records(dictionaries), dictionaries of lists. And vice versa. Hence it lets you focus on data in Flask based web development, instead of file formats.
16+
**django-excel** is based on `pyexcel <https://github.com/chfw/pyexcel>`_ and makes it easy to consume/produce information stored in excel files over HTTP protocol as well as on file system. This library can turn the excel data into Pythonic a list of lists, a list of records(dictionaries), dictionaries of lists. And vice versa. Hence it lets you focus on data in Django web development, instead of file formats.
1717

1818
The highlighted features are:
1919

@@ -49,6 +49,7 @@ Installation
4949
--------------
5050
You can install it from github only for now::
5151

52+
$ pip install git+https://github.com/chfw/pyexcel.git # pyexcel v0.1.3 is not released yet
5253
$ git clone http://github.com/chfw/django-pyexcel.git
5354
$ cd django-excel
5455
$ python setup.py install
@@ -322,20 +323,22 @@ API Reference
322323
.. method:: save_to_database(table=None, **keywords)
323324

324325
:param table: a database table or a tuple which have this sequence (table, table_init_func, mapdict, name_columns_by_row, name_rows_by_column)
325-
:param table_init_func: it is needed when your table had custom __init__ function
326-
:param mapdict: it is needed when the uploaded sheet had a different column headers than the table column names this mapdict tells which column of the upload sheet maps to which column of the table
327-
:param name_columns_by_row: uses the first row of the sheet to be column headers by default. if you use name_rows_by_column, please set this to -1
328-
:param name_rows_by_column: uses a column to name rows.
326+
327+
==================== =================================================================================
328+
Field Description
329+
==================== =================================================================================
330+
table_init_funcs it is needed when your table had custom __init__ function
331+
mapdict model column names
332+
name_columns_by_row use a row to name columns. if you use name_rows_by_column, please set this to -1
333+
name_rows_by_column uses a column to name rows.
334+
==================== =================================================================================
335+
329336
:param keywords: additional keywords to pyexcel library
330337

331338

332339
.. method:: save_book_to_database(tables=None, **keywords)
333340

334-
:param tables: a list of database tables or tuples which have this sequence (table, table_init_func, mapdict, name_columns_by_row, name_rows_by_column)
335-
:param table_init_funcs: it is needed when your table had custom __init__ function
336-
:param mapdict: it is needed when the uploaded sheet had a different column headers than the table column names. this mapdict tells which column of the upload sheet maps to which column of the table
337-
:param name_columns_by_row: uses the first row of each sheet to be column headers by default. if you use name_rows_by_column, please set this to -1
338-
:param name_rows_by_column: uses a column to name rows.
341+
:param tables: a list of database tables or tuples which have this sequence (table, table_init_func, mapdict, name_columns_by_row, name_rows_by_column), see :meth:`~ExcelMixin.save_to_database`
339342
:param keywords: additional keywords to pyexcel library
340343

341344

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
README_txt = readme.read()
1010

1111
dependencies = [
12-
'pyexcel>=0.1.2',
12+
'pyexcel>=0.1.3',
1313
'pyexcel-webio>=0.0.1',
1414
'Django==1.7.1'
1515
]

0 commit comments

Comments
 (0)