Skip to content
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
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.1 - 21.10.2020
--------------------------------------------------------------------------------

**Updated**

#. Restrict this library to get installed on python 3.6+, because pyexcel-io
0.6.0+ supports only python 3.6+.

0.6.0 - 8.10.2020
--------------------------------------------------------------------------------

Expand Down
4 changes: 3 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pyexcel-xls - Let you focus on data, instead of xls format
.. image:: https://raw.githubusercontent.com/pyexcel/pyexcel.github.io/master/images/patreon.png
:target: https://www.patreon.com/chfw

.. image:: https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg
.. 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
Expand Down Expand Up @@ -65,6 +65,8 @@ Known constraints

Fonts, colors and charts are not supported.

Nor to read password protected xls, xlsx and ods files.

Installation
================================================================================

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:
- "Restrict this library to get installed on python 3.6+, because pyexcel-io 0.6.0+ supports only python 3.6+."
date: 21.10.2020
version: 0.6.1
- changes:
- action: Updated
details:
Expand Down
6 changes: 3 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@

project = 'pyexcel-xls'
copyright = '2015-2020 Onni Software Ltd.'
author = 'chfw'
author = 'C.W.'
# The short X.Y version
version = '0.6.0'
version = '0.6.1'
# The full version, including alpha/beta/rc tags
release = '0.6.0'
release = '0.6.1'

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

Expand Down
2 changes: 1 addition & 1 deletion lint.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pip install flake8
flake8 --exclude=.moban.d,docs,setup.py --builtins=unicode,xrange,long . && python setup.py checkdocs
flake8 --exclude=.moban.d,docs,setup.py --builtins=unicode,xrange,long . && python setup.py checkdocs
8 changes: 5 additions & 3 deletions pyexcel-xls.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
overrides: "pyexcel.yaml"
name: "pyexcel-xls"
nick_name: xls
version: 0.6.0
current_version: 0.6.0
release: 0.6.0
version: 0.6.1
current_version: 0.6.1
release: 0.6.1
file_type: xls
is_on_conda: true
dependencies:
Expand All @@ -14,3 +14,5 @@ test_dependencies:
- pyexcel
description: A wrapper library to read, manipulate and write data in xls format. It reads xlsx and xlsm format
moban_command: false
python_requires: ">=3.6"
min_python_version: "3.6"
26 changes: 14 additions & 12 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@
locale.setlocale(locale.LC_ALL, "en_US.UTF-8")

NAME = "pyexcel-xls"
AUTHOR = "chfw"
VERSION = "0.6.0"
AUTHOR = "C.W."
VERSION = "0.6.1"
EMAIL = "info@pyexcel.org"
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.0.tar.gz" % URL
DOWNLOAD_URL = "%s/archive/0.6.1.tar.gz" % URL
FILES = ["README.rst","CONTRIBUTORS.rst", "CHANGELOG.rst"]
KEYWORDS = [
"python",
Expand All @@ -53,18 +53,19 @@
"Topic :: Software Development :: Libraries",
"Programming Language :: Python",
"Intended Audience :: Developers",
"Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",

"Programming Language :: Python :: 3 :: Only",



"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",

'Programming Language :: Python :: Implementation :: PyPy'
]

PYTHON_REQUIRES = ">=3.6"

INSTALL_REQUIRES = [
"pyexcel-io>=0.6.2",
Expand All @@ -78,13 +79,14 @@
}
# You do not need to read beyond this line
PUBLISH_COMMAND = "{0} setup.py sdist bdist_wheel upload -r pypi".format(sys.executable)
GS_COMMAND = ("gs pyexcel-xls v0.6.0 " +
"Find 0.6.0 in changelog for more details")
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")
NO_GS_MESSAGE = ("Automatic github release is disabled. " +
"Please install gease to enable it.")
UPLOAD_FAILED_MSG = (
'Upload failed. please run "%s" yourself.' % PUBLISH_COMMAND)
HERE = os.path.abspath(os.path.dirname(__file__))


class PublishCommand(Command):
Expand Down Expand Up @@ -130,7 +132,6 @@ def run(self):
"publish": PublishCommand
})


def has_gease():
"""
test if github release command is installed
Expand Down Expand Up @@ -199,6 +200,7 @@ def filter_out_test_code(file_handle):
long_description=read_files(*FILES),
license=LICENSE,
keywords=KEYWORDS,
python_requires=PYTHON_REQUIRES,
extras_require=EXTRAS_REQUIRE,
tests_require=["nose"],
install_requires=INSTALL_REQUIRES,
Expand Down