diff --git a/.github/workflows/moban-update.yml b/.github/workflows/moban-update.yml index 7248179..73a3aed 100644 --- a/.github/workflows/moban-update.yml +++ b/.github/workflows/moban-update.yml @@ -21,10 +21,8 @@ jobs: git diff --exit-code - name: Auto-commit if: failure() - uses: docker://cdssnc/auto-commit-github-action - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: stefanzweifel/git-auto-commit-action@v4 with: - args: >- + commit_message: >- This is an auto-commit, updating project meta data, such as changelog.rst, contributors.rst diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 613b1e5..8c35fa2 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,16 @@ Change log ================================================================================ +0.6.3 - tbd +-------------------------------------------------------------------------------- + +**Updated** + +#. `#46 `_: remove the hard + pin on xlrd version < 2.0 +#. `#47 `_: limit support to + persist datetime.timedelta. see more details in doc + 0.6.2 - 12.12.2020 -------------------------------------------------------------------------------- diff --git a/README.rst b/README.rst index 2505490..b4b6546 100644 --- a/README.rst +++ b/README.rst @@ -39,6 +39,16 @@ pyexcel-xls - Let you focus on data, instead of xls format write data in xls format and it can read xlsx and xlsm fromat. You are likely to use it with `pyexcel `_. +Update: + +1. v0.6.3 removed the pin on xlrd < 2. If you have xlrd >= 2, this +library will NOT read 'xlsx' format and you need to install pyexcel-xlsx. Othwise, +this library can use xlrd < 2 to read xlsx format for you. So 'xlsx' support +in this library will vary depending on the installed version of xlrd. + +2. 0.6.3 can write datetime.timedelta. but when the value is read out, +you will get datetime.datetime. so you as the developer decides what to do with it. + 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. @@ -51,7 +61,7 @@ please use pyexcel-xlsx. Warning ================================================================================ -xls file cannot contain more than 65,000 rows. You are risking the reputation +**xls file cannot contain more than 65,000 rows**. You are risking the reputation of yourself/your company/ `your country `_ if you keep using xls and are not aware of its row limit. @@ -353,7 +363,7 @@ Then install relevant development requirements: #. pip install -r tests/requirements.txt Once you have finished your changes, please provide test case(s), relevant documentation -and update CHANGELOG.rst. +and update changelog.yml .. note:: @@ -372,7 +382,7 @@ On Linux/Unix systems, please launch your tests like this:: $ make -On Windows systems, please issue this command:: +On Windows, please issue this command:: > test.bat @@ -384,7 +394,7 @@ Please run:: $ make format -so as to beautify your code otherwise travis-ci may fail your unit test. +so as to beautify your code otherwise your build may fail your unit test. Known Issues diff --git a/docs/source/conf.py b/docs/source/conf.py index 550ca04..3816479 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -28,7 +28,7 @@ author = 'C.W.' # The short X.Y version version = '0.6.2' # The full version, including alpha/beta/rc tags -release = '0.6.2' +release = '0.6.3' # -- General configuration --------------------------------------------------- diff --git a/requirements.txt b/requirements.txt index 65ffc34..4c06b39 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ pyexcel-io>=0.6.2 -xlrd<2 +xlrd xlwt diff --git a/setup.py b/setup.py index 9000415..663c693 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ except (ValueError, UnicodeError, locale.Error): NAME = "pyexcel-xls" AUTHOR = "C.W." -VERSION = "0.6.2" +VERSION = "0.6.3" EMAIL = "info@pyexcel.org" LICENSE = "New BSD" DESCRIPTION = ( @@ -40,7 +40,7 @@ DESCRIPTION = ( "reads xlsx and xlsm format" ) URL = "https://github.com/pyexcel/pyexcel-xls" -DOWNLOAD_URL = "%s/archive/0.6.2.tar.gz" % URL +DOWNLOAD_URL = "%s/archive/0.6.3.tar.gz" % URL FILES = ["README.rst","CONTRIBUTORS.rst", "CHANGELOG.rst"] KEYWORDS = [ "python", @@ -69,7 +69,7 @@ PYTHON_REQUIRES = ">=3.6" INSTALL_REQUIRES = [ "pyexcel-io>=0.6.2", - "xlrd<2", + "xlrd", "xlwt", ] SETUP_COMMANDS = {} @@ -81,8 +81,8 @@ EXTRAS_REQUIRE = { 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.2 " + - "Find 0.6.2 in changelog for more details") +GS_COMMAND = ("gease pyexcel-xls v0.6.3 " + + "Find 0.6.3 in changelog for more details") NO_GS_MESSAGE = ("Automatic github release is disabled. " + "Please install gease to enable it.") UPLOAD_FAILED_MSG = (