Skip to content

Commit 698a55d

Browse files
authored
Merge pull request #43 from pyexcel/dev
Release 0.6.2
2 parents 9cce13b + 26b665c commit 698a55d

17 files changed

+138
-75
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ With your PR, here is a check list:
44
- [ ] Has all code lines tested?
55
- [ ] Has `make format` been run?
66
- [ ] Please update CHANGELOG.yml(not CHANGELOG.rst)
7-
- [ ] Passes all Travis CI builds
87
- [ ] Has fair amount of documentation if your change is complex
98
- [ ] Agree on NEW BSD License for your contribution

.github/workflows/lint.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: lint
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
lint:
7+
runs-on: ubuntu-latest
8+
name: lint code
9+
steps:
10+
- uses: actions/checkout@v2
11+
- name: Set up Python
12+
uses: actions/setup-python@v1
13+
with:
14+
python-version: 3.8
15+
- name: lint
16+
run: |
17+
pip install flake8
18+
pip install -r tests/requirements.txt
19+
flake8 --exclude=.moban.d,docs,setup.py --builtins=unicode,xrange,long .
20+
python setup.py checkdocs

.github/workflows/moban-update.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ jobs:
88
- uses: actions/checkout@v2
99
with:
1010
ref: ${{ github.head_ref }}
11+
token: ${{ secrets.PAT }}
1112
- name: Set up Python
1213
uses: actions/setup-python@v1
1314
with:

.github/workflows/tests.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: run_tests
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
test:
7+
strategy:
8+
fail-fast: false
9+
matrix:
10+
python-version: [3.6, 3.7, 3.8, 3.9]
11+
os: [macOs-latest, ubuntu-latest, windows-latest]
12+
13+
runs-on: ${{ matrix.os }}
14+
name: run tests
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Set up Python
18+
uses: actions/setup-python@v1
19+
with:
20+
python-version: ${{ matrix.python-version }}
21+
- name: install
22+
run: |
23+
pip install -r requirements.txt
24+
pip install -r tests/requirements.txt
25+
- name: test
26+
run: |
27+
pip freeze
28+
nosetests --verbosity=3 --with-coverage --cover-package pyexcel_xls --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_xls
29+
- name: Upload coverage
30+
uses: codecov/codecov-action@v1
31+
with:
32+
name: ${{ matrix.os }} Python ${{ matrix.python-version }}

.moban.d/custom_README.rst.jj2

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,26 @@
44
{% endblock %}
55

66
{%block description%}
7-
**pyexcel-{{file_type}}** is a tiny wrapper library to read, manipulate and write data in {{file_type}} format and it can read xlsx and xlsm fromat. You are likely to use it with `pyexcel <https://github.com/pyexcel/pyexcel>`_.
7+
**pyexcel-{{file_type}}** is a tiny wrapper library to read, manipulate and
8+
write data in {{file_type}} format and it can read xlsx and xlsm fromat.
9+
You are likely to use it with `pyexcel <https://github.com/pyexcel/pyexcel>`_.
810

9-
New flag: `detect_merged_cells` allows you to spread the same value among all merged cells. But be aware that this may slow down its reading performance.
11+
New flag: `detect_merged_cells` allows you to spread the same value among
12+
all merged cells. But be aware that this may slow down its reading
13+
performance.
1014

11-
New flag: `skip_hidden_row_and_column` allows you to skip hidden rows and columns and is defaulted to **True**. It may slow down its reading performance. And it is only valid for 'xls' files. For 'xlsx' files, please use pyexcel-xlsx.
15+
New flag: `skip_hidden_row_and_column` allows you to skip hidden rows
16+
and columns and is defaulted to **True**. It may slow down its reading
17+
performance. And it is only valid for 'xls' files. For 'xlsx' files,
18+
please use pyexcel-xlsx.
19+
20+
Warning
21+
================================================================================
22+
23+
xls file cannot contain more than 65,000 rows. You are risking the reputation
24+
of yourself/your company/
25+
`your country <https://www.bbc.co.uk/news/technology-54423988>`_ if you keep
26+
using xls and are not aware of its row limit.
1227

1328
{%endblock%}
1429

.moban.d/xls_travis.yml.jj2

Lines changed: 0 additions & 8 deletions
This file was deleted.

.moban.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ targets:
55
- README.rst: custom_README.rst.jj2
66
- setup.py: custom_setup.py.jj2
77
- "docs/source/conf.py": "docs/source/conf.py.jj2"
8-
- .travis.yml: xls_travis.yml.jj2
98
- .gitignore: gitignore.jj2
109
- MANIFEST.in: MANIFEST.in.jj2
1110
- "tests/requirements.txt": "tests/custom_requirements.txt.jj2"

.readthedocs.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# .readthedocs.yml
2+
# Read the Docs configuration file
3+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
4+
5+
# Required
6+
version: 2
7+
8+
# Build documentation in the docs/ directory with Sphinx
9+
sphinx:
10+
configuration: docs/source/conf.py
11+
12+
# Optionally build your docs in additional formats such as PDF
13+
formats:
14+
- pdf
15+
16+
# Optionally set the version of Python and requirements required to build your docs
17+
python:
18+
version: 3.7

.travis.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

CHANGELOG.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
Change log
22
================================================================================
33

4+
0.6.2 - 12.12.2020
5+
--------------------------------------------------------------------------------
6+
7+
**Updated**
8+
9+
#. lock down xlrd version less than version 2.0, because 2.0+ does not support
10+
xlsx read
11+
412
0.6.1 - 21.10.2020
513
--------------------------------------------------------------------------------
614

0 commit comments

Comments
 (0)