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/pyexcel-xls
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.5.6
Choose a base ref
...
head repository: pyexcel/pyexcel-xls
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,479 additions and 593 deletions.
  1. +4 −0 .github/FUNDING.yml
  2. +8 −0 .github/PULL_REQUEST_TEMPLATE.md
  3. +20 −0 .github/workflows/lint.yml
  4. +28 −0 .github/workflows/moban-update.yml
  5. +26 −0 .github/workflows/pythonpublish.yml
  6. +35 −0 .github/workflows/tests.yml
  7. +461 −13 .gitignore
  8. +10 −0 .isort.cfg
  9. +0 −21 .moban.d/README.rst
  10. +50 −0 .moban.d/custom_README.rst.jj2
  11. +2 −0 .moban.d/{setup.py → custom_setup.py.jj2}
  12. +1 −1 .moban.d/tests/{base.py → custom_base.py.jj2}
  13. +4 −0 .moban.d/tests/{requirements.txt → custom_requirements.txt.jj2}
  14. +0 −29 .moban.d/travis.yml
  15. +4 −20 .moban.yml
  16. +18 −0 .readthedocs.yml
  17. +0 −39 .travis.yml
  18. +78 −38 CHANGELOG.rst
  19. +10 −0 CONTRIBUTORS.rst
  20. +2 −2 LICENSE
  21. +3 −0 MANIFEST.in
  22. +12 −1 Makefile
  23. +82 −50 README.rst
  24. +45 −0 changelog.yml
  25. +70 −29 docs/source/conf.py
  26. +3 −0 format.sh
  27. +2 −0 lint.sh
  28. +18 −0 pyexcel-xls.yml
  29. +46 −11 pyexcel_xls/__init__.py
  30. +92 −111 pyexcel_xls/xlsr.py
  31. +47 −29 pyexcel_xls/xlsw.py
  32. +1 −1 requirements.txt
  33. +1 −1 rnd_requirements.txt
  34. +80 −53 setup.py
  35. +1 −1 test.bat
  36. +2 −1 test.sh
  37. +0 −1 tests/_compact.py
  38. +10 −7 tests/base.py
  39. BIN tests/fixtures/pyexcel_issue_151.xlsx
  40. +6 −0 tests/requirements.txt
  41. +46 −24 tests/test_bug_fixes.py
  42. +29 −19 tests/test_filter.py
  43. +53 −22 tests/test_formatters.py
  44. +11 −6 tests/test_hidden.py
  45. +26 −27 tests/test_merged_cells.py
  46. +14 −14 tests/test_multiple_sheets.py
  47. +12 −13 tests/test_stringio.py
  48. +6 −9 tests/test_writer.py
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
28 changes: 28 additions & 0 deletions .github/workflows/moban-update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
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 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
26 changes: 26 additions & 0 deletions .github/workflows/pythonpublish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Upload Python Package

on:
release:
types: [created]

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- 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 twine
- name: Build and publish
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
python setup.py sdist bdist_wheel
twine upload dist/*
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_tests

on: [push, pull_request]

jobs:
test:
strategy:
fail-fast: false
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
os: [macOs-latest, ubuntu-latest, windows-latest]
exclude:
- os: macOs-latest
python-version: 3.6

runs-on: ${{ matrix.os }}
name: run tests
steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- 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 pyexcel_xls --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_xls
- name: Upload coverage
uses: codecov/codecov-action@v1
with:
name: ${{ matrix.os }} Python ${{ matrix.python-version }}
Loading