Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pyexcel-webwares/django-excel
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.0.8
Choose a base ref
...
head repository: pyexcel-webwares/django-excel
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 1,983 additions and 647 deletions.
  1. +4 −0 .github/FUNDING.yml
  2. +8 −0 .github/PULL_REQUEST_TEMPLATE.md
  3. +20 −0 .github/workflows/lint.yml
  4. +29 −0 .github/workflows/moban-update.yml
  5. +31 −0 .github/workflows/pythonpublish.yml
  6. +35 −0 .github/workflows/tests.yml
  7. +545 −1 .gitignore
  8. 0 .moban.d/{README.rst → custom_README.rst.jj2}
  9. +2 −7 .moban.d/{setup.py → custom_setup.py.jj2}
  10. +40 −0 .moban.d/custom_travis.yml.jj2
  11. +0 −1 .moban.d/docs/source/conf.py
  12. +44 −11 .moban.d/docs/source/{index.rst.jj2 → django-index.rst.jj2}
  13. +3 −0 .moban.d/tests/{requirements.txt → custom_requirements.txt.jj2}
  14. +0 −62 .moban.d/travis.yml
  15. +9 −6 .moban.d/verified_frameworks.rst.jj2
  16. +7 −12 .moban.yml
  17. +23 −0 .readthedocs.yml
  18. +44 −46 .travis.yml
  19. +41 −14 CHANGELOG.rst
  20. +11 −0 CONTRIBUTORS.rst
  21. +3 −3 LICENSE
  22. +3 −0 MANIFEST.in
  23. +12 −3 Makefile
  24. +154 −94 README.rst
  25. +56 −0 changelog.yml
  26. +18 −4 django_excel.yml
  27. +101 −49 django_excel/__init__.py
  28. +9 −7 django_excel/_compact.py
  29. +0 −4 doc/requirements.txt
  30. 0 {doc → docs}/Makefile
  31. 0 {doc → docs}/make.bat
  32. +3 −0 docs/requirements.txt
  33. 0 {doc → docs}/source/_static/handsontable.full.min.css
  34. 0 {doc → docs}/source/_static/handsontable.full.min.js
  35. 0 {doc → docs}/source/_themes/djangodocs-epub/epub-cover.html
  36. 0 {doc → docs}/source/_themes/djangodocs-epub/static/docicons-behindscenes.png
  37. 0 {doc → docs}/source/_themes/djangodocs-epub/static/docicons-note.png
  38. 0 {doc → docs}/source/_themes/djangodocs-epub/static/docicons-philosophy.png
  39. 0 {doc → docs}/source/_themes/djangodocs-epub/static/docicons-warning.png
  40. 0 {doc → docs}/source/_themes/djangodocs-epub/static/epub.css
  41. 0 {doc → docs}/source/_themes/djangodocs-epub/theme.conf
  42. 0 {doc → docs}/source/_themes/djangodocs/genindex.html
  43. 0 {doc → docs}/source/_themes/djangodocs/layout.html
  44. 0 {doc → docs}/source/_themes/djangodocs/modindex.html
  45. 0 {doc → docs}/source/_themes/djangodocs/search.html
  46. 0 {doc → docs}/source/_themes/djangodocs/static/default.css
  47. 0 {doc → docs}/source/_themes/djangodocs/static/djangodocs.css
  48. BIN {doc → docs}/source/_themes/djangodocs/static/docicons-behindscenes.png
  49. BIN {doc → docs}/source/_themes/djangodocs/static/docicons-note.png
  50. BIN {doc → docs}/source/_themes/djangodocs/static/docicons-philosophy.png
  51. BIN {doc → docs}/source/_themes/djangodocs/static/docicons-warning.png
  52. 0 {doc → docs}/source/_themes/djangodocs/static/homepage.css
  53. 0 {doc → docs}/source/_themes/djangodocs/static/reset-fonts-grids.css
  54. 0 {doc → docs}/source/_themes/djangodocs/theme.conf
  55. BIN {doc → docs}/source/admin-vote.png
  56. BIN {doc → docs}/source/choice-admin.png
  57. BIN {doc → docs}/source/choice-sheet.png
  58. +3 −6 {doc → docs}/source/conf.py
  59. +7 −0 docs/source/contents.rst
  60. BIN {doc → docs}/source/custom-export.png
  61. BIN {doc → docs}/source/download-dialog.png
  62. BIN {doc → docs}/source/download-file.png
  63. BIN {doc → docs}/source/handsontable-choice.png
  64. BIN {doc → docs}/source/handsontable-embedded.png
  65. BIN {doc → docs}/source/handsontable-question.png
  66. BIN {doc → docs}/source/import-page.png
  67. +147 −62 {doc → docs}/source/index.rst
  68. BIN {doc → docs}/source/question-admin.png
  69. BIN {doc → docs}/source/question-sheet.png
  70. 0 {doc → docs}/source/spelling_wordlist.txt
  71. BIN {doc → docs}/source/survey-result.png
  72. BIN {doc → docs}/source/upload-form.png
  73. BIN {doc → docs}/source/votes-handson-table.png
  74. +0 −4 document.bat
  75. +3 −0 format.sh
  76. +2 −0 lint.sh
  77. +11 −1 mysite/settings.py
  78. +4 −3 mysite/urls.py
  79. +1 −1 polls/models.py
  80. +26 −19 polls/urls.py
  81. +150 −71 polls/views.py
  82. +2 −1 requirements.txt
  83. +1 −7 rnd_requirements.txt
  84. BIN sample-data.xls
  85. BIN sample-sheet-for-isave.xls
  86. +146 −45 setup.py
  87. +2 −1 test.bat
  88. +2 −1 test.sh
  89. +215 −101 testResponse.py
  90. +6 −0 tests/requirements.txt
4 changes: 4 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# These are supported funding model platforms

github: chfw
patreon: chfw
8 changes: 8 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
With your PR, here is a check list:

- [ ] Has test cases written?
- [ ] Has all code lines tested?
- [ ] Has `make format` been run?
- [ ] Please update CHANGELOG.yml(not CHANGELOG.rst)
- [ ] Has fair amount of documentation if your change is complex
- [ ] Agree on NEW BSD License for your contribution
20 changes: 20 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: lint

on: [push, pull_request]

jobs:
lint:
runs-on: ubuntu-latest
name: lint code
steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: 3.8
- name: lint
run: |
pip --use-deprecated=legacy-resolver install flake8
pip --use-deprecated=legacy-resolver install -r tests/requirements.txt
flake8 --exclude=.moban.d,docs,setup.py --builtins=unicode,xrange,long .
python setup.py checkdocs
29 changes: 29 additions & 0 deletions .github/workflows/moban-update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
on: [push]

jobs:
run_moban:
runs-on: ubuntu-latest
name: synchronize templates via moban
steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}
token: ${{ secrets.PAT }}
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: '3.7'
- name: check changes
run: |
pip install markupsafe==2.0.1
pip install moban gitfs2 pypifs moban-jinja2-github moban-ansible
moban
git status
git diff --exit-code
- name: Auto-commit
if: failure()
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: >-
This is an auto-commit, updating project meta data,
such as changelog.rst, contributors.rst
31 changes: 31 additions & 0 deletions .github/workflows/pythonpublish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Upload Python Package

on:
release:
types: [created]

jobs:
pypi-publish:
name: upload release to PyPI
runs-on: ubuntu-latest
# Specifying a GitHub environment is optional, but strongly encouraged
environment: pypi
permissions:
# IMPORTANT: this permission is mandatory for trusted publishing
id-token: write
steps:
# retrieve your distributions here
- uses: actions/checkout@v1
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel
- name: Build
run: |
python setup.py sdist bdist_wheel
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
35 changes: 35 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Run unit tests on Windows, Ubuntu and Mac

on: [push, pull_request]

jobs:

test:
name: ${{ matrix.os }} / ${{ matrix.python_version }}
runs-on: ${{ matrix.os }}-latest
strategy:
fail-fast: false
matrix:
os: [Ubuntu]
python_version: ["3.9.16"]

steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python_version }}
architecture: x64

- name: install
run: |
pip --use-deprecated=legacy-resolver install -r requirements.txt
pip --use-deprecated=legacy-resolver install -r tests/requirements.txt
- name: test
run: |
pip freeze
nosetests --verbosity=3 --with-coverage --cover-package django_excel --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source django_excel
- name: Upload coverage
uses: codecov/codecov-action@v1
with:
name: ${{ matrix.os }} Python ${{ matrix.python-version }}
Loading