Skip to content

Commit 0769623

Browse files
committed
documentation update.. sync with latest pyexcel-commons
1 parent 271d61f commit 0769623

File tree

6 files changed

+42
-38
lines changed

6 files changed

+42
-38
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ matrix:
2121
env: DJANGO_VERSION=1.8.2
2222
before_install:
2323
- pip install Django==$DJANGO_VERSION
24+
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
2425
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
2526
mv min_requirements.txt requirements.txt ;
2627
fi

README.rst

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ django-excel - Let you focus on data, instead of file formats
1111
.. image:: https://readthedocs.org/projects/django-excel/badge/?version=latest
1212
:target: http://django-excel.readthedocs.org/en/latest/
1313

14+
Here is a typical conversation between the developer and the user::
15+
16+
User: "I have uploaded an excel file"
17+
"but your application says un-supported file format"
18+
Developer: "Did you upload an xlsx file or a csv file?"
19+
User: "Well, I am not sure. I saved the data using "
20+
"Microsoft Excel. Surely, it must be in an excel format."
21+
Developer: "OK. Here is the thing. I were not told to support"
22+
"all available excel formats in day 1. Live with it"
23+
"or delay the project x number of days."
24+
1425
**django-excel** is based on `pyexcel <https://github.com/pyexcel/pyexcel>`_ and makes
1526
it easy to consume/produce information stored in excel files over HTTP protocol as
1627
well as on file system. This library can turn the excel data into a list of lists,
@@ -19,24 +30,17 @@ lets you focus on data in Django based web development, instead of file formats.
1930

2031
The idea originated from the common usability problem when developing an excel file
2132
driven web applications for non-technical office workers: such as office assistant,
22-
human resource administrator. It is an un-deniable fact that not all people know the
33+
human resource administrator. The fact is that not all people know the
2334
difference among various excel formats: csv, xls, xlsx. Instead of training those people
2435
about file formats, this library helps web developers to handle most of the excel file
25-
formats by providing a common programming interface.
26-
27-
.. note::
28-
Here is a typical conversation between the developer and the user::
29-
30-
User: "I have uploaded an excel file"
31-
"but your application says un-supported file format"
32-
Developer: "Did you upload an xlsx file or a csv file?"
33-
User: "Well, I am not sure. I saved the data using "
34-
"Microsoft Excel. Surely, it must be in an excel format."
36+
formats by providing a common programming interface. To add a specific excel file format
37+
to you application, all you need is to install an extra pyexcel plugin. No code change
38+
to your application.
3539

3640
The highlighted features are:
3741

3842
#. excel data import into and export from databases
39-
#. turn uploaded excel file directly into Python data struture
43+
#. turn uploaded excel file directly into Python data structure
4044
#. pass Python data structures as an excel file download
4145
#. provide data persistence as an excel file in server side
4246
#. supports csv, tsv, csvz, tsvz by default and other formats are supported via
@@ -63,7 +67,7 @@ The highlighted features are:
6367
.. _pyexcel-ods3: https://github.com/pyexcel/pyexcel-ods3
6468
.. _pyexcel-text: https://github.com/pyexcel/pyexcel-text
6569

66-
This library makes infomation processing involving various excel files as easy as
70+
This library makes information processing involving various excel files as easy as
6771
processing array, dictionary when processing file upload/download, data import into
6872
and export from SQL databases, information analysis and persistence. It uses
6973
**pyexcel** and its plugins:

django_excel.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
overrides: "pyexcel.yaml"
22
name: "django-excel"
3-
version: 0.0.4
3+
version: 0.0.5
4+
release: 0.0.4
45
webframework: Django
56
dependencies:
67
- pyexcel>=0.2.0

doc/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
intersphinx_mapping = {
1010
'pyexcel': ('http://pyexcel.readthedocs.org/en/latest/', None)
1111
}
12-
12+
spelling_word_list_filename = 'spelling_wordlist.txt'
1313
templates_path = ['_templates']
1414
source_suffix = '.rst'
1515
master_doc = 'index'
1616

1717
project = u'django-excel'
1818
copyright = u'2015-2016 Onni Software Ltd.'
19-
version = '0.0.4'
19+
version = '0.0.5'
2020
release = '0.0.4'
2121
exclude_patterns = []
2222
pygments_style = 'sphinx'

doc/source/index.rst

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,21 @@ Welcome to django-excel's documentation!
99
:Author: C.W.
1010
:Issues: http://github.com/pyexcel/django-excel/issues
1111
:License: New BSD License
12-
:Version: |version|
12+
:Development: |version|
13+
:Released: |release|
1314
:Generated: |today|
1415

16+
Here is a typical conversation between the developer and the user::
17+
18+
User: "I have uploaded an excel file"
19+
"but your application says un-supported file format"
20+
Developer: "Did you upload an xlsx file or a csv file?"
21+
User: "Well, I am not sure. I saved the data using "
22+
"Microsoft Excel. Surely, it must be in an excel format."
23+
Developer: "OK. Here is the thing. I were not told to support"
24+
"all available excel formats in day 1. Live with it"
25+
"or delay the project x number of days."
26+
1527
**django-excel** is based on `pyexcel <https://github.com/pyexcel/pyexcel>`_ and makes
1628
it easy to consume/produce information stored in excel files over HTTP protocol as
1729
well as on file system. This library can turn the excel data into a list of lists,
@@ -20,24 +32,17 @@ lets you focus on data in Django based web development, instead of file formats.
2032

2133
The idea originated from the common usability problem when developing an excel file
2234
driven web applications for non-technical office workers: such as office assistant,
23-
human resource administrator. It is an un-deniable fact that not all people know the
35+
human resource administrator. The fact is that not all people know the
2436
difference among various excel formats: csv, xls, xlsx. Instead of training those people
2537
about file formats, this library helps web developers to handle most of the excel file
26-
formats by providing a common programming interface.
27-
28-
.. note::
29-
Here is a typical conversation between the developer and the user::
30-
31-
User: "I have uploaded an excel file"
32-
"but your application says un-supported file format"
33-
Developer: "Did you upload an xlsx file or a csv file?"
34-
User: "Well, I am not sure. I saved the data using "
35-
"Microsoft Excel. Surely, it must be in an excel format."
38+
formats by providing a common programming interface. To add a specific excel file format
39+
to you application, all you need is to install an extra pyexcel plugin. No code change
40+
to your application.
3641

3742
The highlighted features are:
3843

3944
#. excel data import into and export from databases
40-
#. turn uploaded excel file directly into Python data struture
45+
#. turn uploaded excel file directly into Python data structure
4146
#. pass Python data structures as an excel file download
4247
#. provide data persistence as an excel file in server side
4348
#. supports csv, tsv, csvz, tsvz by default and other formats are supported via
@@ -64,7 +69,7 @@ The highlighted features are:
6469
.. _pyexcel-ods3: https://github.com/pyexcel/pyexcel-ods3
6570
.. _pyexcel-text: https://github.com/pyexcel/pyexcel-text
6671

67-
This library makes infomation processing involving various excel files as easy as
72+
This library makes information processing involving various excel files as easy as
6873
processing array, dictionary when processing file upload/download, data import into
6974
and export from SQL databases, information analysis and persistence. It uses
7075
**pyexcel** and its plugins:
@@ -545,10 +550,3 @@ Response methods
545550
:param status: same as :meth:`~django_excel.make_response`
546551

547552

548-
Indices and tables
549-
--------------------
550-
551-
* :ref:`genindex`
552-
* :ref:`modindex`
553-
* :ref:`search`
554-

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
NAME = 'django-excel'
99
AUTHOR = 'C.W.'
10-
VERSION = '0.0.4'
10+
VERSION = '0.0.5'
1111
EMAIL = 'wangc_2011 (at) hotmail.com'
1212
LICENSE = 'New BSD'
1313
PACKAGES = find_packages(exclude=['ez_setup', 'examples', 'tests'])

0 commit comments

Comments
 (0)