Skip to content

Release 0.6.2 #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ With your PR, here is a check list:
- [ ] Has all code lines tested?
- [ ] Has `make format` been run?
- [ ] Please update CHANGELOG.yml(not CHANGELOG.rst)
- [ ] Passes all Travis CI builds
- [ ] 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 install flake8
pip install -r tests/requirements.txt
flake8 --exclude=.moban.d,docs,setup.py --builtins=unicode,xrange,long .
python setup.py checkdocs
1 change: 1 addition & 0 deletions .github/workflows/moban-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ jobs:
- uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}
token: ${{ secrets.PAT }}
- name: Set up Python
uses: actions/setup-python@v1
with:
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
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]

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 install -r requirements.txt
pip 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 }}
21 changes: 18 additions & 3 deletions .moban.d/custom_README.rst.jj2
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,26 @@
{% endblock %}

{%block description%}
**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>`_.
**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>`_.

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

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

Warning
================================================================================

xls file cannot contain more than 65,000 rows. You are risking the reputation
of yourself/your company/
`your country <https://www.bbc.co.uk/news/technology-54423988>`_ if you keep
using xls and are not aware of its row limit.

{%endblock%}

Expand Down
8 changes: 0 additions & 8 deletions .moban.d/xls_travis.yml.jj2

This file was deleted.

1 change: 0 additions & 1 deletion .moban.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ targets:
- README.rst: custom_README.rst.jj2
- setup.py: custom_setup.py.jj2
- "docs/source/conf.py": "docs/source/conf.py.jj2"
- .travis.yml: xls_travis.yml.jj2
- .gitignore: gitignore.jj2
- MANIFEST.in: MANIFEST.in.jj2
- "tests/requirements.txt": "tests/custom_requirements.txt.jj2"
18 changes: 18 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# .readthedocs.yml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/source/conf.py

# Optionally build your docs in additional formats such as PDF
formats:
- pdf

# Optionally set the version of Python and requirements required to build your docs
python:
version: 3.7
43 changes: 0 additions & 43 deletions .travis.yml

This file was deleted.

8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Change log
================================================================================

0.6.2 - 12.12.2020
--------------------------------------------------------------------------------

**Updated**

#. lock down xlrd version less than version 2.0, because 2.0+ does not support
xlsx read

0.6.1 - 21.10.2020
--------------------------------------------------------------------------------

Expand Down
3 changes: 2 additions & 1 deletion CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@


1 contributors
2 contributors
================================================================================

In alphabetical order:

* `John Vandenberg <https://github.com/jayvdb>`_
* `Peter Carnesciali <https://github.com/pcarn>`_
27 changes: 21 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ pyexcel-xls - Let you focus on data, instead of xls format
.. image:: https://raw.githubusercontent.com/pyexcel/pyexcel-mobans/master/images/awesome-badge.svg
:target: https://awesome-python.com/#specific-formats-processing

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

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

.. image:: https://pepy.tech/badge/pyexcel-xls/month
:target: https://pepy.tech/project/pyexcel-xls/month
:target: https://pepy.tech/project/pyexcel-xls

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

**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>`_.
**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>`_.

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

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

Warning
================================================================================

xls file cannot contain more than 65,000 rows. You are risking the reputation
of yourself/your company/
`your country <https://www.bbc.co.uk/news/technology-54423988>`_ if you keep
using xls and are not aware of its row limit.


Support the project
Expand Down
6 changes: 6 additions & 0 deletions changelog.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: pyexcel-xls
organisation: pyexcel
releases:
- changes:
- action: Updated
details:
- "lock down xlrd version less than version 2.0, because 2.0+ does not support xlsx read"
date: 12.12.2020
version: 0.6.2
- changes:
- action: Updated
details:
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
copyright = '2015-2020 Onni Software Ltd.'
author = 'C.W.'
# The short X.Y version
version = '0.6.1'
version = '0.6.2'
# The full version, including alpha/beta/rc tags
release = '0.6.1'
release = '0.6.2'

# -- General configuration ---------------------------------------------------

Expand Down
8 changes: 4 additions & 4 deletions pyexcel-xls.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
overrides: "pyexcel.yaml"
name: "pyexcel-xls"
nick_name: xls
version: 0.6.1
current_version: 0.6.1
release: 0.6.1
version: 0.6.2
current_version: 0.6.2
release: 0.6.2
file_type: xls
is_on_conda: true
dependencies:
- pyexcel-io>=0.6.2
- xlrd
- xlrd<2
- xlwt
test_dependencies:
- pyexcel
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pyexcel-io>=0.6.2
xlrd
xlrd<2
xlwt
10 changes: 5 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@

NAME = "pyexcel-xls"
AUTHOR = "C.W."
VERSION = "0.6.1"
VERSION = "0.6.2"
EMAIL = "[email protected]"
LICENSE = "New BSD"
DESCRIPTION = (
"A wrapper library to read, manipulate and write data in xls format. It" +
"reads xlsx and xlsm format"
)
URL = "https://github.com/pyexcel/pyexcel-xls"
DOWNLOAD_URL = "%s/archive/0.6.1.tar.gz" % URL
DOWNLOAD_URL = "%s/archive/0.6.2.tar.gz" % URL
FILES = ["README.rst","CONTRIBUTORS.rst", "CHANGELOG.rst"]
KEYWORDS = [
"python",
Expand Down Expand Up @@ -69,7 +69,7 @@

INSTALL_REQUIRES = [
"pyexcel-io>=0.6.2",
"xlrd",
"xlrd<2",
"xlwt",
]
SETUP_COMMANDS = {}
Expand All @@ -81,8 +81,8 @@
PUBLISH_COMMAND = "{0} setup.py sdist bdist_wheel upload -r pypi".format(sys.executable)
HERE = os.path.abspath(os.path.dirname(__file__))

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