diff --git a/.moban.d/verified_frameworks.rst.jj2 b/.moban.d/verified_frameworks.rst.jj2 index cf989ae..2f2f15e 100644 --- a/.moban.d/verified_frameworks.rst.jj2 +++ b/.moban.d/verified_frameworks.rst.jj2 @@ -18,3 +18,5 @@ Tested Django Versions .. image:: https://img.shields.io/badge/django-1.6.11-green.svg :target: http://travis-ci.org/pyexcel/django-excel + +Test on django 2.0.1 fails. diff --git a/.moban.yml b/.moban.yml index 14cdb8c..a409c02 100644 --- a/.moban.yml +++ b/.moban.yml @@ -14,3 +14,6 @@ targets: - MANIFEST.in: MANIFEST.in - "docs/source/index.rst": "docs/source/index.rst.jj2" - "tests/requirements.txt": "tests/requirements.txt" + - output: CHANGELOG.rst + configuration: changelog.yml + template: CHANGELOG.rst.jj2 diff --git a/.travis.yml b/.travis.yml index 05a8524..d09dae0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ env: - DJANGO_VERSION=1.9.13 - DJANGO_VERSION=1.10.7 - DJANGO_VERSION=1.11.2 - - DJANGO_VERSION=2.0.1 python: - 2.6 - 2.7 @@ -29,10 +28,6 @@ matrix: env: DJANGO_VERSION=1.10.7 - python: 2.6 env: DJANGO_VERSION=1.11.2 - - python: 2.6 - env: DJANGO_VERSION=2.0.1 - - python: 2.7 - env: DJANGO_VERSION=2.0.1 - python: 3.3 env: DJANGO_VERSION=1.11.2 - python: 3.4 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c4feedb..5d11ca3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,11 +1,20 @@ Change log ================================================================================ +0.0.10 - 11.01.2018 +-------------------------------------------------------------------------------- + +Added +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +#. `pyexcel-io#46 `_, expose + `bulk_save` to django developers + 0.0.9 - 12.07.2017 -------------------------------------------------------------------------------- Added -******************************************************************************** +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ #. bring isave_to_database and isave_book_to_database @@ -13,37 +22,36 @@ Added -------------------------------------------------------------------------------- Added -******************************************************************************** +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -#. `issue 39 `_, explicitly +#. `pyexcel#39 `_, explicitly seeking at 0 0.0.7 - 29.06.2017 -------------------------------------------------------------------------------- Added -******************************************************************************** +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -#. `issue 38 `_, Support +#. `pyexcel#38 `_, Support unicode code as download file name 0.0.6 - 12.22.2016 -------------------------------------------------------------------------------- Updated -******************************************************************************** +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -#. `issue 26 `_, raise - ioerror if content is empty. +#. `pyexcel#26 `_, raise ioerror + if content is empty. #. Use pyexcel-webio v0.0.9 so as to push out new version of pyexcel and its plugins. - 0.0.5 - 26.08.2016 -------------------------------------------------------------------------------- Added: -******************************************************************************** +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ #. Support for django 1.6.x #. Tested against django 1.10 diff --git a/README.rst b/README.rst index 1e13430..acff532 100644 --- a/README.rst +++ b/README.rst @@ -5,7 +5,7 @@ django-excel - Let you focus on data, instead of file formats .. image:: https://raw.githubusercontent.com/pyexcel/pyexcel.github.io/master/images/patreon.png :target: https://www.patreon.com/pyexcel -.. image:: https://api.travis-ci.org/pyexcel-webwares/django-excel.svg?branch=master +.. image:: https://travis-ci.org/pyexcel-webwares/django-excel.svg?branch=master :target: http://travis-ci.org/pyexcel-webwares/django-excel .. image:: https://codecov.io/gh/pyexcel-webwares/django-excel/branch/master/graph/badge.svg @@ -28,6 +28,8 @@ If you are an individual, you are welcome to support me too on patreon and for h you feel like. As a patreon, you will receive `early access to pyexcel related contents `_. +And your issues will get prioritized if you would like to become my patreon as `pyexcel pro user`. + With your financial support, I will be able to invest a little bit more time in coding, documentation and writing interesting posts. @@ -202,6 +204,8 @@ Tested Django Versions .. image:: https://img.shields.io/badge/django-1.6.11-green.svg :target: http://travis-ci.org/pyexcel/django-excel +Test on django 2.0.1 fails. + Installation ================================================================================ diff --git a/django_excel.yml b/django_excel.yml index e5f5539..f0388f3 100644 --- a/django_excel.yml +++ b/django_excel.yml @@ -1,11 +1,12 @@ overrides: "pyexcel.yaml" name: "django-excel" organisation: pyexcel-webwares -version: 0.0.9 -current_version: 0.0.9 -release: 0.0.9 +version: 0.0.10 +current_version: 0.0.10 +release: 0.0.10 webframework: Django dependencies: + - pyexcel>=0.5.7 - pyexcel-webio>=0.1.2 - Django>=1.6.1 extra_dependencies: diff --git a/docs/source/conf.py b/docs/source/conf.py index bcb3661..732bd33 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -12,19 +12,17 @@ 'sphinxcontrib.spelling', 'sphinxcontrib.excel' ] - intersphinx_mapping = { 'pyexcel': ('http://pyexcel.readthedocs.io/en/latest/', None), } -spelling_word_list_filename = 'spelling_wordlist.txt' templates_path = ['_templates'] source_suffix = '.rst' master_doc = 'index' project = u'django-excel' -copyright = u'2015-2017 Onni Software Ltd.' -version = '0.0.9' -release = '0.0.9' +copyright = u'2015-2018 Onni Software Ltd.' +version = '0.0.10' +release = '0.0.10' exclude_patterns = [] pygments_style = 'sphinx' import os # noqa diff --git a/docs/source/index.rst b/docs/source/index.rst index ef2e14f..07bc9d2 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -6,7 +6,7 @@ `django-excel` - Let you focus on data, instead of file formats ================================================================================ -:Author: C.W. +:Author: C. Wang :Source code: http://github.com/pyexcel-webwares/django-excel.git :Issues: http://github.com/pyexcel-webwares/django-excel/issues :License: New BSD License @@ -213,6 +213,8 @@ If you are an individual, you are welcome to support me too on patreon and for h you feel like. As a patreon, you will receive `early access to pyexcel related contents `_. +And your issues will get prioritized if you would like to become my patreon as `pyexcel pro user`. + With your financial support, I will be able to invest a little bit more time in coding, documentation and writing interesting posts. @@ -731,5 +733,3 @@ Response methods :param models: a list of Django models :param file_type: same as :meth:`~django_excel.make_response` :param status: same as :meth:`~django_excel.make_response` - - diff --git a/requirements.txt b/requirements.txt index dcebdb7..b542a84 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ +pyexcel>=0.5.7 pyexcel-webio>=0.1.2 Django>=1.6.1 diff --git a/setup.py b/setup.py index 3985492..32af51d 100644 --- a/setup.py +++ b/setup.py @@ -8,17 +8,16 @@ PY26 = PY2 and sys.version_info[1] < 7 NAME = 'django-excel' -AUTHOR = 'C.W.' -VERSION = '0.0.9' +AUTHOR = 'C. Wang' +VERSION = '0.0.10' EMAIL = 'wangc_2011@hotmail.com' LICENSE = 'New BSD' DESCRIPTION = ( - 'A django middleware that provides one application programming interfac' + - 'e to read and write data in different excel file formats' + - '' + 'A django middleware that provides one application programming' + + 'interface to read and write data in different excel file formats' ) URL = 'https://github.com/pyexcel-webwares/django-excel' -DOWNLOAD_URL = '%s/archive/0.0.9.tar.gz' % URL +DOWNLOAD_URL = '%s/archive/0.0.10.tar.gz' % URL FILES = ['README.rst', 'CHANGELOG.rst'] KEYWORDS = [ 'API', @@ -55,6 +54,7 @@ ] INSTALL_REQUIRES = [ + 'pyexcel>=0.5.7', 'pyexcel-webio>=0.1.2', 'Django>=1.6.1', ] @@ -69,8 +69,8 @@ # You do not need to read beyond this line PUBLISH_COMMAND = '{0} setup.py sdist bdist_wheel upload -r pypi'.format( sys.executable) -GS_COMMAND = ('gs django-excel v0.0.9 ' + - "Find 0.0.9 in changelog for more details") +GS_COMMAND = ('gs django-excel v0.0.10 ' + + "Find 0.0.10 in changelog for more details") NO_GS_MESSAGE = ('Automatic github release is disabled. ' + 'Please install gease to enable it.') UPLOAD_FAILED_MSG = (