Skip to content

Commit 698a55d

Browse files
chfwchfw
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

-1
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

+20
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

+1
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

+32
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

+18-3
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

-8
This file was deleted.

‎.moban.yml

-1
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

+18
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

-43
This file was deleted.

‎CHANGELOG.rst

+8
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

‎CONTRIBUTORS.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11

22

3-
1 contributors
3+
2 contributors
44
================================================================================
55

66
In alphabetical order:
77

88
* `John Vandenberg <https://github.com/jayvdb>`_
9+
* `Peter Carnesciali <https://github.com/pcarn>`_

‎README.rst

+21-6
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ pyexcel-xls - Let you focus on data, instead of xls format
88
.. image:: https://raw.githubusercontent.com/pyexcel/pyexcel-mobans/master/images/awesome-badge.svg
99
:target: https://awesome-python.com/#specific-formats-processing
1010

11-
.. image:: https://travis-ci.org/pyexcel/pyexcel-xls.svg?branch=master
12-
:target: http://travis-ci.org/pyexcel/pyexcel-xls
11+
.. image:: https://github.com/pyexcel/pyexcel-xls/workflows/run_tests/badge.svg
12+
:target: http://github.com/pyexcel/pyexcel-xls/actions
1313

1414
.. image:: https://codecov.io/gh/pyexcel/pyexcel-xls/branch/master/graph/badge.svg
1515
:target: https://codecov.io/gh/pyexcel/pyexcel-xls
@@ -21,7 +21,7 @@ pyexcel-xls - Let you focus on data, instead of xls format
2121
:target: https://anaconda.org/conda-forge/pyexcel-xls
2222

2323
.. image:: https://pepy.tech/badge/pyexcel-xls/month
24-
:target: https://pepy.tech/project/pyexcel-xls/month
24+
:target: https://pepy.tech/project/pyexcel-xls
2525

2626
.. image:: https://anaconda.org/conda-forge/pyexcel-xls/badges/downloads.svg
2727
:target: https://anaconda.org/conda-forge/pyexcel-xls
@@ -35,11 +35,26 @@ pyexcel-xls - Let you focus on data, instead of xls format
3535
.. image:: https://img.shields.io/static/v1?label=coding%20style&message=black&color=black&style=flat-square
3636
:target: https://github.com/psf/black
3737

38-
**pyexcel-xls** is a tiny wrapper library to read, manipulate and write data in xls format and it can read xlsx and xlsm fromat. You are likely to use it with `pyexcel <https://github.com/pyexcel/pyexcel>`_.
38+
**pyexcel-xls** is a tiny wrapper library to read, manipulate and
39+
write data in xls format and it can read xlsx and xlsm fromat.
40+
You are likely to use it with `pyexcel <https://github.com/pyexcel/pyexcel>`_.
3941

40-
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.
42+
New flag: `detect_merged_cells` allows you to spread the same value among
43+
all merged cells. But be aware that this may slow down its reading
44+
performance.
4145

42-
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.
46+
New flag: `skip_hidden_row_and_column` allows you to skip hidden rows
47+
and columns and is defaulted to **True**. It may slow down its reading
48+
performance. And it is only valid for 'xls' files. For 'xlsx' files,
49+
please use pyexcel-xlsx.
50+
51+
Warning
52+
================================================================================
53+
54+
xls file cannot contain more than 65,000 rows. You are risking the reputation
55+
of yourself/your company/
56+
`your country <https://www.bbc.co.uk/news/technology-54423988>`_ if you keep
57+
using xls and are not aware of its row limit.
4358

4459

4560
Support the project

‎changelog.yml

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: pyexcel-xls
22
organisation: pyexcel
33
releases:
4+
- changes:
5+
- action: Updated
6+
details:
7+
- "lock down xlrd version less than version 2.0, because 2.0+ does not support xlsx read"
8+
date: 12.12.2020
9+
version: 0.6.2
410
- changes:
511
- action: Updated
612
details:

‎docs/source/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
copyright = '2015-2020 Onni Software Ltd.'
2727
author = 'C.W.'
2828
# The short X.Y version
29-
version = '0.6.1'
29+
version = '0.6.2'
3030
# The full version, including alpha/beta/rc tags
31-
release = '0.6.1'
31+
release = '0.6.2'
3232

3333
# -- General configuration ---------------------------------------------------
3434

‎pyexcel-xls.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
overrides: "pyexcel.yaml"
22
name: "pyexcel-xls"
33
nick_name: xls
4-
version: 0.6.1
5-
current_version: 0.6.1
6-
release: 0.6.1
4+
version: 0.6.2
5+
current_version: 0.6.2
6+
release: 0.6.2
77
file_type: xls
88
is_on_conda: true
99
dependencies:
1010
- pyexcel-io>=0.6.2
11-
- xlrd
11+
- xlrd<2
1212
- xlwt
1313
test_dependencies:
1414
- pyexcel

‎requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
pyexcel-io>=0.6.2
2-
xlrd
2+
xlrd<2
33
xlwt

‎setup.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232

3333
NAME = "pyexcel-xls"
3434
AUTHOR = "C.W."
35-
VERSION = "0.6.1"
35+
VERSION = "0.6.2"
3636
EMAIL = "[email protected]"
3737
LICENSE = "New BSD"
3838
DESCRIPTION = (
3939
"A wrapper library to read, manipulate and write data in xls format. It" +
4040
"reads xlsx and xlsm format"
4141
)
4242
URL = "https://github.com/pyexcel/pyexcel-xls"
43-
DOWNLOAD_URL = "%s/archive/0.6.1.tar.gz" % URL
43+
DOWNLOAD_URL = "%s/archive/0.6.2.tar.gz" % URL
4444
FILES = ["README.rst","CONTRIBUTORS.rst", "CHANGELOG.rst"]
4545
KEYWORDS = [
4646
"python",
@@ -69,7 +69,7 @@
6969

7070
INSTALL_REQUIRES = [
7171
"pyexcel-io>=0.6.2",
72-
"xlrd",
72+
"xlrd<2",
7373
"xlwt",
7474
]
7575
SETUP_COMMANDS = {}
@@ -81,8 +81,8 @@
8181
PUBLISH_COMMAND = "{0} setup.py sdist bdist_wheel upload -r pypi".format(sys.executable)
8282
HERE = os.path.abspath(os.path.dirname(__file__))
8383

84-
GS_COMMAND = ("gease pyexcel-xls v0.6.1 " +
85-
"Find 0.6.1 in changelog for more details")
84+
GS_COMMAND = ("gease pyexcel-xls v0.6.2 " +
85+
"Find 0.6.2 in changelog for more details")
8686
NO_GS_MESSAGE = ("Automatic github release is disabled. " +
8787
"Please install gease to enable it.")
8888
UPLOAD_FAILED_MSG = (

0 commit comments

Comments
 (0)