Skip to content

Commit b882c5c

Browse files
committed
🤝 apply common templates from pyexcel mobans. moremoban/moban#348
1 parent 91d0334 commit b882c5c

File tree

18 files changed

+362
-322
lines changed

18 files changed

+362
-322
lines changed

.github/FUNDING.yml

Lines changed: 4 additions & 0 deletions
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

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
With your PR, here is a check list:
2+
3+
- [ ] Has Test cases written
4+
- [ ] Has all code lines tested
5+
- [ ] Passes all Travis CI builds
6+
- [ ] Has fair amount of documentation if your change is complex
7+
- [ ] run 'make format' so as to confirm the pyexcel organisation's coding style
8+
- [ ] Please update CHANGELOG.rst
9+
- [ ] Please add yourself to CONTRIBUTORS.rst
10+
- [ ] Agree on NEW BSD License for your contribution

.isort.cfg

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[settings]
2+
line_length=79
3+
known_first_party=pyexcel, ezodf
4+
known_third_party=mock,nose
5+
indent=' '
6+
multi_line_output=3
7+
length_sort=1
8+
default_section=FIRSTPARTY
9+
no_lines_before=LOCALFOLDER
10+
sections=FUTURE,STDLIB,FIRSTPARTY,THIRDPARTY,LOCALFOLDER

.moban.yml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
1-
requires:
2-
- type: git
3-
url: https://github.com/moremoban/pypi-mobans
4-
submodule: true
5-
- https://github.com/pyexcel/pyexcel-mobans
1+
overrides: "git://github.com/pyexcel/pyexcel-mobans!/mobanfile.yaml"
62
configuration:
7-
configuration_dir: "pyexcel-mobans:config"
8-
template_dir:
9-
- "pyexcel-mobans:templates"
10-
- "pypi-mobans:templates"
11-
- ".moban.d"
123
configuration: pyexcel-ods3.yml
134
targets:
14-
- README.rst: README.rst
15-
- setup.py: setup.py
5+
- README.rst: custom_README.rst.jj2
6+
- setup.py: custom_setup.py.jj2
167
- "docs/source/conf.py": "docs/source/conf.py.jj2"
17-
- .travis.yml: travis.yml
18-
- requirements.txt: requirements.txt
8+
- .travis.yml: custom_travis.yml.jj2
199
- MANIFEST.in: MANIFEST.in.jj2
2010
- "tests/requirements.txt": "tests/requirements.txt"
21-
- test.sh: test.script.jj2
22-
- test.bat: test.script.jj2
2311
- "tests/test_filter.py": "tests/test_filter.py.jj2"
2412
- "tests/test_formatters.py": "tests/test_formatters.py"
2513
- "tests/test_stringio.py": "tests/test_stringio.py.jj2"

.travis.yml

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
sudo: false
2+
dist: xenial
23
language: python
34
notifications:
45
email: false
@@ -8,14 +9,58 @@ python:
89
- 3.5
910
- 3.4
1011
- 2.7
12+
13+
stages:
14+
- lint
15+
- moban
16+
- test
17+
18+
.disable_global: &disable_global
19+
addons: false
20+
cache: false
21+
env: {}
22+
python: false
23+
before_install: false
24+
install: false
25+
before_script: false
26+
script: false
27+
after_success: false
28+
after_failure: false
29+
before_deploy: false
30+
deploy: false
31+
32+
.lint: &lint
33+
<<: *disable_global
34+
git:
35+
submodules: false
36+
python: 3.6
37+
stage: lint
38+
script: make lint
39+
40+
.moban: &moban
41+
<<: *disable_global
42+
python: 3.6
43+
stage: moban
44+
install: pip install moban>=0.0.4
45+
script:
46+
- moban
47+
- git diff --exit-code
48+
49+
jobs:
50+
include:
51+
- *moban
52+
- *lint
53+
54+
stage: test
55+
1156
before_install:
1257
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi
1358
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install weakrefset; fi
14-
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
1559
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
1660
mv min_requirements.txt requirements.txt ;
1761
fi
18-
- test ! -f rnd_requirements.txt || pip install --no-deps -r rnd_requirements.txt
62+
- test ! -f rnd_requirements.txt ||
63+
pip install --no-deps -r rnd_requirements.txt
1964
- test ! -f rnd_requirements.txt || pip install -r rnd_requirements.txt ;
2065
- pip install -r tests/requirements.txt
2166
script:

CHANGELOG.rst

Lines changed: 39 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -4,137 +4,122 @@ Change log
44
0.5.3 - 27.11.2018
55
--------------------------------------------------------------------------------
66

7-
added
8-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7+
**added**
98

10-
#. `#57 <https://github.com/pyexcel/pyexcel-io/issues/57>`_, long type will not
11-
be written in ods. please use string type. And if the integer is equal or
9+
10+
**^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^**
11+
12+
#. `pyexcel#57 <https://github.com//pyexcel/issues/57>`_, long type will not be
13+
written in ods. please use string type. And if the integer is equal or
1214
greater than 10 to the power of 16, it will not be written either in ods. In
1315
both situation, IntegerPrecisionLossError will be raised.
1416

15-
1617
0.5.2 - 23.10.2017
1718
--------------------------------------------------------------------------------
1819

19-
updated
20-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
21-
#. pyexcel `#105 <https://github.com/pyexcel/pyexcel/issues/105>`_, remove gease
20+
**updated**
21+
22+
#. pyexcel `pyexcel#105 <https://github.com//pyexcel/issues/105>`_, remove gease
2223
from setup_requires, introduced by 0.5.1.
2324
#. remove python2.6 test support
2425
#. update its dependecy on pyexcel-io to 0.5.3
2526

2627
0.5.1 - 20.10.2017
2728
--------------------------------------------------------------------------------
2829

29-
added
30-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
30+
**added**
3131

32-
#. `#103 <https://github.com/pyexcel/pyexcel/issues/103>`_, include LICENSE file
32+
#. `pyexcel#103 <https://github.com//pyexcel/issues/103>`_, include LICENSE file
3333
in MANIFEST.in, meaning LICENSE file will appear in the released tar ball.
3434

35-
3635
0.5.0 - 30.08.2017
3736
--------------------------------------------------------------------------------
3837

39-
Updated
40-
********************************************************************************
38+
**Updated**
4139

4240
#. put dependency on pyexcel-io 0.5.0, which uses cStringIO instead of StringIO.
4341
Hence, there will be performance boost in handling files in memory.
4442

45-
Relocated
46-
--------------------------------------------------------------------------------
43+
**Relocated**
4744

4845
#. All ods type conversion code lives in pyexcel_io.service module
4946

5047
0.4.1 - 17.08.2017
5148
--------------------------------------------------------------------------------
5249

53-
Updated
54-
--------------------------------------------------------------------------------
55-
56-
#. update dependency to use pyexcel-ezodf v0.3.3 as ezodf 0.3.2 has
57-
`the bug <https://github.com/pyexcel/pyexcel-ezodf/issues/1>`_, cannot
58-
handle file alike objects and has not been updated for 2 years.
50+
**Updated**
5951

52+
#. update dependency to use pyexcel-ezodf v0.3.3 as ezodf 0.3.2 has `the bug
53+
<https://github.com/pyexcel/pyexcel-ezodf/issues/1>`_, cannot handle file
54+
alike objects and has not been updated for 2 years.
6055

6156
0.4.0 - 19.06.2017
6257
--------------------------------------------------------------------------------
6358

64-
Updated
65-
********************************************************************************
66-
67-
#. `#14 <https://github.com/pyexcel/pyexcel-xlsx/issues/14>`_, close file
68-
handle
69-
#. pyexcel-io plugin interface now updated to use
70-
`lml <https://github.com/chfw/lml>`_.
59+
**Updated**
7160

61+
#. `pyexcel#14 <https://github.com//pyexcel/issues/14>`_, close file handle
62+
#. pyexcel-io plugin interface now updated to use `lml
63+
<https://github.com/chfw/lml>`_.
7264

7365
0.3.2 - 13.04.2017
7466
--------------------------------------------------------------------------------
7567

76-
Updated
77-
********************************************************************************
68+
**Updated**
7869

79-
#. issue `#8 <https://github.com/pyexcel/pyexcel-ods3/issues/8>`_, PT288H00M00S
80-
is valid duration
70+
#. issue `pyexcel#8 <https://github.com//pyexcel/issues/8>`_, PT288H00M00S is
71+
valid duration
8172

8273
0.3.1 - 02.02.2017
8374
--------------------------------------------------------------------------------
8475

85-
Added
86-
********************************************************************************
76+
**Added**
8777

8878
#. Recognize currency type
8979

9080
0.3.0 - 22.12.2016
9181
--------------------------------------------------------------------------------
9282

93-
Updated
94-
********************************************************************************
83+
**Updated**
9584

9685
#. Code refactoring with pyexcel-io v 0.3.0
9786

9887
0.2.2 - 05.11.2016
9988
--------------------------------------------------------------------------------
10089

101-
Updated
102-
********************************************************************************
103-
104-
#. `#11 <https://github.com/pyexcel/pyexcel-ods3/issues/11>`_, be able to
105-
consume a generator of two dimensional arrays.
90+
**Updated**
10691

92+
#. `pyexcel#11 <https://github.com//pyexcel/issues/11>`_, be able to consume a
93+
generator of two dimensional arrays.
10794

10895
0.2.1 - 31.08.2016
10996
--------------------------------------------------------------------------------
11097

111-
Added
112-
********************************************************************************
98+
**Added**
11399

114100
#. support pagination. two pairs: start_row, row_limit and start_column,
115101
column_limit help you deal with large files.
116102

117-
118103
0.2.0 - 01.06.2016
119104
--------------------------------------------------------------------------------
120105

121-
Added
122-
********************************************************************************
106+
**Added**
123107

124108
#. By default, `float` will be converted to `int` where fits. `auto_detect_int`,
125109
a flag to switch off the autoatic conversion from `float` to `int`.
126-
#. 'library=pyexcel-ods3' was added so as to inform pyexcel to use it instead
127-
of other libraries, in the situation where multiple plugins for the same
128-
file type are installed
129-
110+
#. 'library=pyexcel-ods3' was added so as to inform pyexcel to use it instead of
111+
other libraries, in the situation where multiple plugins for the same file
112+
type are installed
130113

131-
Updated
132-
********************************************************************************
114+
**Updated**
133115

134116
#. support the auto-import feature of pyexcel-io 0.2.0
135-
117+
#. compatibility with pyexcel-io 0.1.0
136118

137119
0.1.0 - 17.01.2016
138120
--------------------------------------------------------------------------------
139121

122+
**Updated**
123+
124+
#. support the auto-import feature of pyexcel-io 0.2.0
140125
#. compatibility with pyexcel-io 0.1.0

LICENSE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015-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

44
Redistribution and use in source and binary forms of the software as well
@@ -13,7 +13,7 @@ that the following conditions are met:
1313
and/or other materials provided with the distribution.
1414

1515
* Neither the name of 'pyexcel-ods3' nor the names of the contributors
16-
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
1717
without specific prior written permission.
1818

1919
THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
@@ -27,4 +27,4 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
2727
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
2828
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2929
SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
30-
DAMAGE.
30+
DAMAGE.

MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
include README.rst
22
include LICENSE
33
include CHANGELOG.rst
4+
recursive-include tests *
5+
recursive-include docs *

README.rst

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,22 @@ pyexcel-ods3 - Let you focus on data, instead of ods format
33
================================================================================
44

55
.. image:: https://raw.githubusercontent.com/pyexcel/pyexcel.github.io/master/images/patreon.png
6-
:target: https://www.patreon.com/pyexcel
7-
8-
.. image:: https://api.bountysource.com/badge/team?team_id=288537
9-
:target: https://salt.bountysource.com/teams/chfw-pyexcel
6+
:target: https://www.patreon.com/chfw
107

118
.. image:: https://travis-ci.org/pyexcel/pyexcel-ods3.svg?branch=master
129
:target: http://travis-ci.org/pyexcel/pyexcel-ods3
1310

1411
.. image:: https://codecov.io/gh/pyexcel/pyexcel-ods3/branch/master/graph/badge.svg
1512
:target: https://codecov.io/gh/pyexcel/pyexcel-ods3
1613

14+
.. image:: https://badge.fury.io/py/pyexcel-ods3.svg
15+
:target: https://pypi.org/project/pyexcel-ods3
16+
17+
18+
.. image:: https://pepy.tech/badge/pyexcel-ods3/month
19+
:target: https://pepy.tech/project/pyexcel-ods3/month
20+
21+
1722
.. image:: https://img.shields.io/gitter/room/gitterHQ/gitter.svg
1823
:target: https://gitter.im/pyexcel/Lobby
1924

@@ -53,7 +58,7 @@ Support the project
5358
================================================================================
5459

5560
If your company has embedded pyexcel and its components into a revenue generating
56-
product, please support me on `patreon <https://www.patreon.com/bePatron?u=5537627>`_
61+
product, please support me on `github <https://github.com/sponsors/chfw>`_, `patreon <https://www.patreon.com/bePatron?u=5537627>`_
5762
or `bounty source <https://salt.bountysource.com/teams/chfw-pyexcel>`_ to maintain
5863
the project and develop it further.
5964

@@ -358,8 +363,6 @@ How to update test environment and update documentation
358363
Additional steps are required:
359364

360365
#. pip install moban
361-
#. git clone https://github.com/moremoban/setupmobans.git # generic setup
362-
#. git clone https://github.com/pyexcel/pyexcel-commons.git commons
363366
#. make your changes in `.moban.d` directory, then issue command `moban`
364367

365368
What is pyexcel-commons
@@ -372,17 +375,6 @@ What is .moban.d
372375

373376
`.moban.d` stores the specific meta data for the library.
374377

375-
Acceptance criteria
376-
-------------------
377-
378-
#. Has Test cases written
379-
#. Has all code lines tested
380-
#. Passes all Travis CI builds
381-
#. Has fair amount of documentation if your change is complex
382-
#. Please update CHANGELOG.rst
383-
#. Please add yourself to CONTRIBUTORS.rst
384-
#. Agree on NEW BSD License for your contribution
385-
386378
Installation Note
387379
================================================================================
388380
The installation of `lxml` will be tricky on Windows platform. It is recommended that you download a lxml's own windows installer instead of using pip.

0 commit comments

Comments
 (0)