Skip to content

Commit f77b5f3

Browse files
committed
Update tutorial app in django 1.11.3
1 parent 899b54b commit f77b5f3

File tree

7 files changed

+42
-32
lines changed

7 files changed

+42
-32
lines changed

.moban.d/docs/source/index.rst.jj2

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ you should check out the code from
2424
git clone https://github.com/pyexcel/django-excel.git
2525

2626
The test application is written according
27-
to `Part 1 <https://docs.djangoproject.com/en/1.7/intro/tutorial01/>`_,
28-
`Part 2 <https://docs.djangoproject.com/en/1.7/intro/tutorial02/>`_ and
29-
`Part 3 <https://docs.djangoproject.com/en/1.7/intro/tutorial03/>`_ of django
30-
tutorial version 1.7.1. If you should wonder how the test application was
31-
written, please visit django documentation and come back.
27+
to `Part 1 <https://docs.djangoproject.com/en/1.11/intro/tutorial01/>`_,
28+
`Part 2 <https://docs.djangoproject.com/en/1.11/intro/tutorial02/>`_ and
29+
`Part 3 <https://docs.djangoproject.com/en/1.11/intro/tutorial03/>`_ of django
30+
tutorial. If you should wonder how the test application was written, please
31+
visit django documentation and come back.
3232

3333
Once you have the code, please change to django-excel directory and then
3434
install all dependencies::
@@ -43,11 +43,20 @@ Then run the test application::
4343
Performing system checks...
4444

4545
System check identified no issues (0 silenced).
46-
January 29, 2015 - 18:11:06
47-
Django version 1.7.1, using settings 'mysite.settings'
46+
47+
You have 9 unapplied migration(s). Your project may not work properly until you apply the migrations for app(s): admin, auth, contenttypes.
48+
Run 'python manage.py migrate' to apply them.
49+
50+
July 06, 2017 - 08:29:10
51+
Django version 1.11.3, using settings 'mysite.settings'
4852
Starting development server at http://127.0.0.1:8000/
49-
Quit the server with CTRL-BREAK.
53+
Quit the server with CONTROL-C.
54+
55+
56+
.. note::
5057

58+
The 9 unapplied migration(s) were ignored because migrations are out of scope in this
59+
tutorial.
5160

5261
Handle excel file upload and download
5362
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

.moban.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ targets:
1313
- LICENSE: LICENSE.jj2
1414
- MANIFEST.in: MANIFEST.in
1515
- "doc/source/index.rst": "docs/source/index.rst.jj2"
16-
- "tests/requirements.txt": "tests/requirements.txt"
16+
- "test_requirements.txt": "tests/requirements.txt"

README.rst

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ django-excel - Let you focus on data, instead of file formats
1111
.. image:: https://codecov.io/github/pyexcel/django-excel/coverage.png
1212
:target: https://codecov.io/github/pyexcel/django-excel
1313

14-
.. image:: https://img.shields.io/gitter/room/gitterHQ/gitter.svg
15-
:target: https://gitter.im/pyexcel/Lobby
16-
1714
.. image:: https://readthedocs.org/projects/django-excel/badge/?version=latest
1815
:target: http://django-excel.readthedocs.org/en/latest/
1916

@@ -79,12 +76,11 @@ The highlighted features are:
7976
`pyexcel-ods`_ ods `odfpy`_ same as above
8077
`pyexcel-odsr`_ ods(read only) lxml same as above
8178
`pyexcel-text`_ (write only)json, rst, `tabulate`_ 2.6, 2.7, 3.3, 3.4
82-
mediawiki, html, 3.5, 3.6, pypy
79+
mediawiki, html, 3.5, pypy, pypy3
8380
latex, grid, pipe,
8481
orgtbl, plain simple
8582
`pyexcel-handsontable`_ handsontable in html `handsontable`_ same as above
86-
`pyexcel-pygal`_ svg chart `pygal`_ 2.7, 3.3, 3.4, 3.5
87-
3.6, pypy
83+
`pyexcel-pygal`_ svg chart `pygal`_ same as above [#f3]_
8884
======================== ======================= =============== ==================
8985

9086
.. _pyexcel-io: https://github.com/pyexcel/pyexcel-io
@@ -111,6 +107,7 @@ The highlighted features are:
111107
.. _pyexcel-matplotlib: https://github.com/pyexcel/pyexcel-matplotlib
112108
.. _matplotlib: https://matplotlib.org
113109

110+
.. [#f3] coming soon
114111
115112
In order to manage the list of plugins installed, you need to use pip to add or remove
116113
a plugin. When you use virtualenv, you can have different plugins per virtual

doc/source/index.rst

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,11 @@ The highlighted features are:
7070
`pyexcel-ods`_ ods `odfpy`_ same as above
7171
`pyexcel-odsr`_ ods(read only) lxml same as above
7272
`pyexcel-text`_ (write only)json, rst, `tabulate`_ 2.6, 2.7, 3.3, 3.4
73-
mediawiki, html, 3.5, 3.6, pypy
73+
mediawiki, html, 3.5, pypy, pypy3
7474
latex, grid, pipe,
7575
orgtbl, plain simple
7676
`pyexcel-handsontable`_ handsontable in html `handsontable`_ same as above
77-
`pyexcel-pygal`_ svg chart `pygal`_ 2.7, 3.3, 3.4, 3.5
78-
3.6, pypy
77+
`pyexcel-pygal`_ svg chart `pygal`_ same as above [#f3]_
7978
======================== ======================= =============== ==================
8079

8180
.. _pyexcel-io: https://github.com/pyexcel/pyexcel-io
@@ -102,6 +101,7 @@ The highlighted features are:
102101
.. _pyexcel-matplotlib: https://github.com/pyexcel/pyexcel-matplotlib
103102
.. _matplotlib: https://matplotlib.org
104103

104+
.. [#f3] coming soon
105105
106106
In order to manage the list of plugins installed, you need to use pip to add or remove
107107
a plugin. When you use virtualenv, you can have different plugins per virtual
@@ -203,11 +203,11 @@ you should check out the code from
203203
git clone https://github.com/pyexcel/django-excel.git
204204

205205
The test application is written according
206-
to `Part 1 <https://docs.djangoproject.com/en/1.7/intro/tutorial01/>`_,
207-
`Part 2 <https://docs.djangoproject.com/en/1.7/intro/tutorial02/>`_ and
208-
`Part 3 <https://docs.djangoproject.com/en/1.7/intro/tutorial03/>`_ of django
209-
tutorial version 1.7.1. If you should wonder how the test application was
210-
written, please visit django documentation and come back.
206+
to `Part 1 <https://docs.djangoproject.com/en/1.11/intro/tutorial01/>`_,
207+
`Part 2 <https://docs.djangoproject.com/en/1.11/intro/tutorial02/>`_ and
208+
`Part 3 <https://docs.djangoproject.com/en/1.11/intro/tutorial03/>`_ of django
209+
tutorial. If you should wonder how the test application was written, please
210+
visit django documentation and come back.
211211

212212
Once you have the code, please change to django-excel directory and then
213213
install all dependencies::
@@ -222,11 +222,20 @@ Then run the test application::
222222
Performing system checks...
223223

224224
System check identified no issues (0 silenced).
225-
January 29, 2015 - 18:11:06
226-
Django version 1.7.1, using settings 'mysite.settings'
225+
226+
You have 9 unapplied migration(s). Your project may not work properly until you apply the migrations for app(s): admin, auth, contenttypes.
227+
Run 'python manage.py migrate' to apply them.
228+
229+
July 06, 2017 - 08:29:10
230+
Django version 1.11.3, using settings 'mysite.settings'
227231
Starting development server at http://127.0.0.1:8000/
228-
Quit the server with CTRL-BREAK.
232+
Quit the server with CONTROL-C.
233+
234+
235+
.. note::
229236

237+
The 9 unapplied migration(s) were ignored because migrations are out of scope in this
238+
tutorial.
230239

231240
Handle excel file upload and download
232241
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

doc/source/upload-form.png

12.4 KB
Loading

mysite/settings.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,8 @@
2323
# SECURITY WARNING: don't run with debug turned on in production!
2424
DEBUG = True
2525

26-
TEMPLATE_DEBUG = True
27-
2826
ALLOWED_HOSTS = []
2927

30-
TEMPLATE_DIRS = [(
31-
BASE_DIR + '/templates/'
32-
)]
3328
# Application definition
3429

3530
FILE_UPLOAD_HANDLERS = ("django_excel.ExcelMemoryFileUploadHandler",
@@ -82,7 +77,7 @@
8277
'django.contrib.auth.context_processors.auth',
8378
'django.contrib.messages.context_processors.messages',
8479
],
85-
},
80+
}
8681
},
8782
]
8883

0 commit comments

Comments
 (0)