Skip to content

Commit 08c6e85

Browse files
chfwchfw
committed
🤝 merge with master
2 parents 086667a + b199660 commit 08c6e85

27 files changed

+333
-221
lines changed

Diff for: ‎.github/FUNDING.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# These are supported funding model platforms
2+
3+
github: chfw
4+
patreon: chfw

Diff for: ‎.github/PULL_REQUEST_TEMPLATE.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
With your PR, here is a check list:
2+
3+
- [ ] Has test cases written?
4+
- [ ] Has all code lines tested?
5+
- [ ] Has `make format` been run?
6+
- [ ] Please update CHANGELOG.yml(not CHANGELOG.rst)
7+
- [ ] Passes all Travis CI builds
8+
- [ ] Has fair amount of documentation if your change is complex
9+
- [ ] Agree on NEW BSD License for your contribution

Diff for: ‎.github/workflows/moban-update.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
on: [push]
2+
3+
jobs:
4+
run_moban:
5+
runs-on: ubuntu-latest
6+
name: synchronize templates via moban
7+
steps:
8+
- uses: actions/checkout@v2
9+
with:
10+
ref: ${{ github.head_ref }}
11+
- name: Set up Python
12+
uses: actions/setup-python@v1
13+
with:
14+
python-version: '3.7'
15+
- name: check changes
16+
run: |
17+
pip install moban gitfs2 pypifs moban-jinja2-github moban-ansible
18+
moban
19+
git status
20+
git diff --exit-code
21+
- name: Auto-commit
22+
if: failure()
23+
uses: docker://cdssnc/auto-commit-github-action
24+
env:
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
with:
27+
args: >-
28+
This is an auto-commit, updating project meta data,
29+
such as changelog.rst, contributors.rst

Diff for: ‎.github/workflows/pythonpublish.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Upload Python Package
2+
3+
on:
4+
release:
5+
types: [created]
6+
7+
jobs:
8+
deploy:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v1
12+
- name: Set up Python
13+
uses: actions/setup-python@v1
14+
with:
15+
python-version: '3.x'
16+
- name: Install dependencies
17+
run: |
18+
python -m pip install --upgrade pip
19+
pip install setuptools wheel twine
20+
- name: Build and publish
21+
env:
22+
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
23+
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
24+
run: |
25+
python setup.py sdist bdist_wheel
26+
twine upload dist/*

Diff for: ‎.moban.d/README.rst renamed to ‎.moban.d/custom_readme.rst.jj2

File renamed without changes.

Diff for: ‎.moban.d/setup.py renamed to ‎.moban.d/custom_setup.py.jj2

File renamed without changes.

Diff for: ‎.moban.d/travis.yml renamed to ‎.moban.d/custom_travis.yml.jj2

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
{%block custom_python_versions%}
44
python:
55
- 3.6
6-
- 3.5
7-
- 3.4
8-
- 3.3
9-
- 2.7
10-
- 2.6
6+
- 3.7
7+
- 3.8
118
{%endblock%}
129

Diff for: ‎.moban.d/tests/requirements.txt renamed to ‎.moban.d/tests/custom_req.txt.jj2

File renamed without changes.

Diff for: ‎.moban.yml

+5-14
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
1+
overrides: "git://github.com/pyexcel/pyexcel-mobans!/mobanfile.yaml"
12
configuration:
2-
configuration_dir: "commons/config"
3-
template_dir:
4-
- "commons/templates"
5-
- "setupmobans/templates"
6-
- ".moban.d"
73
configuration: pyexcel_odsr.yml
84
targets:
9-
- README.rst: README.rst
10-
- setup.py: setup.py
11-
- "docs/source/conf.py": "docs/source/conf.py.jj2"
12-
- .travis.yml: travis.yml
13-
- requirements.txt: requirements.txt
14-
- .gitignore: gitignore.jj2
15-
- "tests/requirements.txt": "tests/requirements.txt"
16-
- test.sh: test.script.jj2
17-
- test.bat: test.script.jj2
5+
- README.rst: custom_readme.rst.jj2
6+
- setup.py: custom_setup.py.jj2
7+
- .travis.yml: custom_travis.yml.jj2
8+
- "tests/requirements.txt": "tests/custom_req.txt.jj2"
189
- "tests/test_filter.py": "tests/test_filter.py.jj2"
1910
- "tests/test_formatters.py": "tests/test_formatters.py"
2011
- "tests/test_stringio.py": "tests/test_stringio.py.jj2"

Diff for: ‎.travis.yml

+38-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,51 @@
11
sudo: false
2+
dist: xenial
23
language: python
34
notifications:
45
email: false
56
python:
67
- 3.6
7-
- 3.5
8-
- 3.4
9-
- 3.3
10-
- 2.7
11-
- 2.6
8+
- 3.7
9+
- 3.8
10+
11+
stages:
12+
- lint
13+
- moban
14+
- test
15+
16+
17+
.lint: &lint
18+
git:
19+
submodules: false
20+
python: 3.6
21+
env:
22+
- MINREQ=0
23+
stage: lint
24+
script: make lint
25+
26+
.moban: &moban
27+
python: 3.6
28+
env:
29+
- MINREQ=0
30+
stage: moban
31+
install: pip install moban gitfs2 pypifs moban-jinja2-github moban-ansible
32+
script:
33+
- moban
34+
- git diff --exit-code
35+
36+
jobs:
37+
include:
38+
- *moban
39+
- *lint
40+
41+
stage: test
42+
1243
before_install:
13-
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
1444
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
1545
mv min_requirements.txt requirements.txt ;
1646
fi
17-
- test ! -f rnd_requirements.txt || pip install --no-deps -r rnd_requirements.txt
47+
- test ! -f rnd_requirements.txt ||
48+
pip install --no-deps -r rnd_requirements.txt
1849
- test ! -f rnd_requirements.txt || pip install -r rnd_requirements.txt ;
1950
- pip install -r tests/requirements.txt
2051
script:

Diff for: ‎CHANGELOG.rst

-56
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,2 @@
11
Change log
22
================================================================================
3-
4-
0.4.3 - 25.08.2017
5-
--------------------------------------------------------------------------------
6-
7-
#. `#4 <https://github.com/pyexcel/pyexcel-odsr/issues/4>`_, handle unseekable
8-
stream given by http response.
9-
10-
0.4.2 - 20.08.2017
11-
--------------------------------------------------------------------------------
12-
13-
Fix package installation error
14-
15-
0.4.1 - 26.07.2017
16-
--------------------------------------------------------------------------------
17-
18-
Updated
19-
********************************************************************************
20-
21-
#. PR `#3 <https://github.com/pyexcel/pyexcel-odsr/pull/3>`_, support fods, flat
22-
ods file
23-
24-
0.4.0 - 19.06.2017
25-
--------------------------------------------------------------------------------
26-
27-
Updated
28-
********************************************************************************
29-
30-
#. Updated to use lml interface
31-
32-
33-
0.3.2 - 07.05.2017
34-
--------------------------------------------------------------------------------
35-
36-
Updated
37-
********************************************************************************
38-
39-
#. issue `#2 <https://github.com/pyexcel/pyexcel-odsr/issues/2>`_, not all texts
40-
in a multi-node cell were extracted.
41-
42-
0.3.1 - 13.04.2017
43-
--------------------------------------------------------------------------------
44-
45-
Updated
46-
********************************************************************************
47-
48-
#. issue `#1 <https://github.com/pyexcel/pyexcel-odsr/issues/1>`_, PT288H00M00S
49-
is valid duration
50-
51-
52-
0.3.0 - 02.02.2017
53-
--------------------------------------------------------------------------------
54-
55-
#. initial release. It has all functionalities of pyexcel-ods and pyexcel-ods3.
56-
Specially, it supports partial reading of the ods file. When dealing with
57-
big data file, this capability enables pagination feature to indeed read
58-
partial files.

Diff for: ‎CONTRIBUTORS.rst

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
Contributors
2-
================
31

4-
Author is in setup.py file and module __author__. Hence please find the
5-
contributors here.
62

7-
In alphabetic order:
8-
9-
*. `Jona <https://github.com/jonadem>`_
3+
1 contributors
4+
================================================================================
105

6+
In alphabetical order:
117

8+
* `Jona <https://github.com/jonadem>`_

Diff for: ‎LICENSE

+5-27
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
Copyright (c) 2017 by Onni Software Ltd. and its contributors
1+
Copyright (c) 2015-2019 by Onni Software Ltd. and its contributors
22
All rights reserved.
33

4-
Redistribution and use in source and binary forms of the software(
5-
except pyexcel_odsr/messyods.py which is under MIT license of
6-
The Open Knowledge Foundation Ltd., see below) as well as documentation,
7-
with or without modification, are permitted provided that the following
8-
conditions are met:
4+
Redistribution and use in source and binary forms of the software as well
5+
as documentation, with or without modification, are permitted provided
6+
that the following conditions are met:
97

108
* Redistributions of source code must retain the above copyright notice, this
119
list of conditions and the following disclaimer.
@@ -15,7 +13,7 @@ conditions are met:
1513
and/or other materials provided with the distribution.
1614

1715
* Neither the name of 'pyexcel-odsr' nor the names of the contributors
18-
may not be used to endorse or promote products derived from this software
16+
may be used to endorse or promote products derived from this software
1917
without specific prior written permission.
2018

2119
THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
@@ -30,23 +28,3 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
3028
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
3129
SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
3230
DAMAGE.
33-
34-
Copyright (c) 2012-2017 The Open Knowledge Foundation Ltd.
35-
36-
Permission is hereby granted, free of charge, to any person obtaining a copy of
37-
this software and associated documentation files (the "Software"), to deal in
38-
the Software without restriction, including without limitation the rights to
39-
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
40-
of the Software, and to permit persons to whom the Software is furnished to do
41-
so, subject to the following conditions:
42-
43-
The above copyright notice and this permission notice shall be included in all
44-
copies or substantial portions of the Software.
45-
46-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
47-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
48-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
49-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
50-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
51-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
52-
SOFTWARE.

Diff for: ‎Makefile

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
all: test
22

3-
test:
3+
test: lint
44
bash test.sh
55

6+
install_test:
7+
pip install -r tests/requirements.txt
8+
9+
lint:
10+
bash lint.sh
11+
12+
format:
13+
bash format.sh
14+
15+
git-diff-check:
16+
git diff --exit-code

0 commit comments

Comments
 (0)