Skip to content

Commit 07ee703

Browse files
committed
🤝 update project meta data and 💄 update coding style
1 parent de3a929 commit 07ee703

File tree

10 files changed

+41
-41
lines changed

10 files changed

+41
-41
lines changed

.github/PULL_REQUEST_TEMPLATE.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
With your PR, here is a check list:
22

3-
- [ ] Has Test cases written
4-
- [ ] Has all code lines tested
3+
- [ ] Has test cases written?
4+
- [ ] Has all code lines tested?
55
- [ ] Has `make format` been run?
66
- [ ] Please update CHANGELOG.yml(not CHANGELOG.rst)
77
- [ ] Passes all Travis CI builds
88
- [ ] Has fair amount of documentation if your change is complex
9-
- [ ] run 'make format' so as to confirm the pyexcel organisation's coding style
10-
- [ ] Please add yourself to 'contributors' section of pyexcel-ods.yml (if not found, please use CONTRIBUTORS.rst)
119
- [ ] Agree on NEW BSD License for your contribution

.github/workflows/moban-update.yml

+22-20
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,25 @@ jobs:
55
runs-on: ubuntu-latest
66
name: synchronize templates via moban
77
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
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: This is an auto-commit, updating project meta data, such as changelog.rst, contributors.rst
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

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -540,3 +540,7 @@ cscope.files
540540
cscope.out
541541
cscope.in.out
542542
cscope.po.out
543+
544+
545+
# remove moban hash dictionary
546+
.moban.hashes

CONTRIBUTORS.rst

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11

2+
23
3 contributors
34
================================================================================
45

56
In alphabetical order:
67

7-
* `Azamat H. Hackimov <https://api.github.com/users/winterheart>`_
8-
* `John Vandenberg <https://api.github.com/users/jayvdb>`_
9-
* `Mateusz Konieczny <https://api.github.com/users/matkoniecz>`_
8+
* `Azamat H. Hackimov <https://github.com/winterheart>`_
9+
* `John Vandenberg <https://github.com/jayvdb>`_
10+
* `Mateusz Konieczny <https://github.com/matkoniecz>`_

Makefile

-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ test: lint
66
install_test:
77
pip install -r tests/requirements.txt
88

9-
git-diff-check:
10-
git diff --exit-code
11-
129
lint:
1310
bash lint.sh
1411

lint.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
pip install flake8
2-
flake8 . --exclude=.moban.d,docs,setup.py --builtins=unicode,xrange,long
3-
python setup.py checkdocs
2+
flake8 --exclude=.moban.d,docs,setup.py --builtins=unicode,xrange,long . && python setup.py checkdocs

pyexcel_ods/odsr.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,15 @@
2121
# See the License for the specific language governing permissions and
2222
# limitations under the License.
2323

24+
import pyexcel_io.service as service
2425
from odf.text import P
2526
from odf.table import Table, TableRow, TableCell
2627

2728
# Thanks to grt for the fixes
2829
from odf.teletype import extractText
2930
from odf.namespaces import OFFICENS
30-
from odf.opendocument import load
31-
32-
import pyexcel_io.service as service
3331
from pyexcel_io.book import BookReader
32+
from odf.opendocument import load
3433
from pyexcel_io.sheet import SheetReader
3534
from pyexcel_io._compact import OrderedDict
3635

pyexcel_ods/odsw.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
"""
1010
import sys
1111

12+
import pyexcel_io.service as converter
1213
from odf.text import P
1314
from odf.table import Table, TableRow, TableCell
1415
from odf.namespaces import OFFICENS
15-
from odf.opendocument import OpenDocumentSpreadsheet
16-
17-
import pyexcel_io.service as converter
1816
from pyexcel_io.book import BookWriter
17+
from odf.opendocument import OpenDocumentSpreadsheet
1918
from pyexcel_io.sheet import SheetWriter
2019

2120
PY2 = sys.version_info[0] == 2

tests/test_bug_fixes.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# -*- encoding: utf-8 -*-
33
import os
44

5+
import psutil
56
import pyexcel as pe
67
from pyexcel_ods import get_data, save_data
8+
from pyexcel_io.exceptions import IntegerAccuracyLossError
79

8-
import psutil
910
from nose import SkipTest
1011
from nose.tools import eq_, raises
11-
from pyexcel_io.exceptions import IntegerAccuracyLossError
1212

1313
IN_TRAVIS = "TRAVIS" in os.environ
1414

tests/test_filter.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import os
22

3-
from nose.tools import eq_
43
from pyexcel_io import get_data, save_data
54

5+
from nose.tools import eq_
6+
67

78
class TestFilter:
89
def setUp(self):

0 commit comments

Comments
 (0)