Skip to content

Commit 39a3658

Browse files
chfwchfw
authored
Merge pull request #110 from pyexcel/dev
release 0.6.5
2 parents 1136d9b + 5275c1c commit 39a3658

30 files changed

+162
-120
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 --use-deprecated=legacy-resolver install flake8
18+
pip --use-deprecated=legacy-resolver 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

+3-4
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:
@@ -20,10 +21,8 @@ jobs:
2021
git diff --exit-code
2122
- name: Auto-commit
2223
if: failure()
23-
uses: docker://cdssnc/auto-commit-github-action
24-
env:
25-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24+
uses: stefanzweifel/git-auto-commit-action@v4
2625
with:
27-
args: >-
26+
commit_message: >-
2827
This is an auto-commit, updating project meta data,
2928
such as changelog.rst, contributors.rst

‎.github/workflows/tests.yml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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+
exclude:
13+
- os: macOs-latest
14+
python-version: 3.6
15+
16+
runs-on: ${{ matrix.os }}
17+
name: run tests
18+
steps:
19+
- uses: actions/checkout@v2
20+
- name: Set up Python
21+
uses: actions/setup-python@v1
22+
with:
23+
python-version: ${{ matrix.python-version }}
24+
- name: install
25+
run: |
26+
pip --use-deprecated=legacy-resolver install -r requirements.txt
27+
pip --use-deprecated=legacy-resolver install -r tests/requirements.txt
28+
- name: test
29+
run: |
30+
pip freeze
31+
nosetests --verbosity=3 --with-coverage --cover-package pyexcel_io --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_io
32+
- name: Upload coverage
33+
uses: codecov/codecov-action@v1
34+
with:
35+
name: ${{ matrix.os }} Python ${{ matrix.python-version }}

‎.moban.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ configuration:
44
targets:
55
- "docs/source/conf.py": "docs/source/custom_conf.py.jj2"
66
- setup.py: io_setup.py.jj2
7-
- .travis.yml: custom_travis.yml.jj2
87
- README.rst: io_readme.rst.jj2
98
- "docs/source/index.rst": "docs/source/index.rst.jj2"
109
- .gitignore: gitignore.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

-45
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.5 - 08.10.2021
5+
--------------------------------------------------------------------------------
6+
7+
**updated**
8+
9+
#. `#109 <https://github.com/pyexcel/pyexcel-io/issues/109>`_: enable ods3 to
10+
have datetime
11+
412
0.6.4 - 31.10.2020
513
--------------------------------------------------------------------------------
614

‎CONTRIBUTORS.rst

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

22

3-
5 contributors
3+
6 contributors
44
================================================================================
55

66
In alphabetical order:
@@ -9,4 +9,5 @@ In alphabetical order:
99
* `John Vandenberg <https://github.com/jayvdb>`_
1010
* `Stephen J. Fuhry <https://github.com/fuhrysteve>`_
1111
* `Stephen Rauch <https://github.com/stephenrauch>`_
12+
* `vinraspa <https://github.com/vinraspa>`_
1213
* `Víctor Antonio Hernández Monroy <https://github.com/antherkiv>`_

‎README.rst

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ pyexcel-io - Let you focus on data, instead of file formats
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-io.svg?branch=master
12-
:target: http://travis-ci.org/pyexcel/pyexcel-io
11+
.. image:: https://github.com/pyexcel/pyexcel-io/workflows/run_tests/badge.svg
12+
:target: http://github.com/pyexcel/pyexcel-io/actions
1313

1414
.. image:: https://codecov.io/gh/pyexcel/pyexcel-io/branch/master/graph/badge.svg
1515
:target: https://codecov.io/gh/pyexcel/pyexcel-io
@@ -108,9 +108,9 @@ sqlalchemy supported databases. Its supported file formats are extended to cover
108108
Plugin shopping guide
109109
------------------------
110110

111-
Since 2020, all pyexcel-io plugins have dropped the support for python version
112-
lower than 3.6. If you want to use any python verions, please use pyexcel-io
113-
and its plugins version lower than 0.6.0.
111+
Since 2020, all pyexcel-io plugins have dropped the support for python versions
112+
which are lower than 3.6. If you want to use any of those Python versions, please use pyexcel-io
113+
and its plugins versions that are lower than 0.6.0.
114114

115115

116116
Except csv files, xls, xlsx and ods files are a zip of a folder containing a lot of
@@ -205,7 +205,7 @@ Then install relevant development requirements:
205205
#. pip install -r tests/requirements.txt
206206

207207
Once you have finished your changes, please provide test case(s), relevant documentation
208-
and update CHANGELOG.rst.
208+
and update changelog.yml
209209

210210
.. note::
211211

@@ -224,7 +224,7 @@ On Linux/Unix systems, please launch your tests like this::
224224

225225
$ make
226226

227-
On Windows systems, please issue this command::
227+
On Windows, please issue this command::
228228

229229
> test.bat
230230

@@ -236,7 +236,7 @@ Please run::
236236

237237
$ make format
238238

239-
so as to beautify your code otherwise travis-ci may fail your unit test.
239+
so as to beautify your code otherwise your build may fail your unit test.
240240

241241

242242

‎changelog.yml

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: pyexcel-io
22
organisation: pyexcel
33
releases:
4+
- changes:
5+
- action: updated
6+
details:
7+
- "`#109`: enable ods3 to have datetime"
8+
version: 0.6.5
9+
date: 08.10.2021
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.4'
29+
version = '0.6.5'
3030
# The full version, including alpha/beta/rc tags
31-
release = '0.6.4'
31+
release = '0.6.5'
3232

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

‎docs/source/index.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ For individual excel file formats, please install them as you wish:
9696
Plugin shopping guide
9797
------------------------
9898

99-
Since 2020, all pyexcel-io plugins have dropped the support for python version
100-
lower than 3.6. If you want to use any python verions, please use pyexcel-io
101-
and its plugins version lower than 0.6.0.
99+
Since 2020, all pyexcel-io plugins have dropped the support for python versions
100+
which are lower than 3.6. If you want to use any of those Python versions, please use pyexcel-io
101+
and its plugins versions that are lower than 0.6.0.
102102

103103

104104
Except csv files, xls, xlsx and ods files are a zip of a folder containing a lot of

‎docs/source/plaincsv.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Here is an example to write a sentence of "Shui Dial Getou"[#f2] into a csv file
153153
154154
.. code-block:: python
155155
156-
>>> content = [[u'人有悲歡離合', u'月有陰晴圓缺']]
156+
>>> content = [['löyly', 'löyly']]
157157
>>> test_file = "test-utf8-BOM.csv"
158158
>>> save_data(test_file, content, encoding="utf-8-sig", lineterminator="\n")
159159

‎pyexcel-io.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ overrides: "pyexcel.yaml"
22
project: "pyexcel-io"
33
name: pyexcel-io
44
nick_name: io
5-
version: 0.6.4
6-
current_version: 0.6.4
7-
release: 0.6.4
5+
version: 0.6.5
6+
current_version: 0.6.5
7+
release: 0.6.5
88
copyright_year: 2015-2020
99
moban_command: false
1010
is_on_conda: true

‎pyexcel_io/_compact.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def emit(self, record):
2727

2828

2929
def isstream(instance):
30-
""" check if a instance is a stream """
30+
"""check if a instance is a stream"""
3131
try:
3232
import mmap
3333

0 commit comments

Comments
 (0)