Skip to content

Commit 9cb4660

Browse files
committed
✨ use inherited mobanfile. moremoban/moban#348
1 parent 90e7bca commit 9cb4660

16 files changed

+142
-119
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
File renamed without changes.
File renamed without changes.
File renamed without changes.

.moban.yml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,10 @@
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: django_excel.yml
134
targets:
14-
- README.rst: README.rst
15-
- setup.py: setup.py
16-
- .travis.yml: travis.yml
17-
- requirements.txt: requirements.txt
5+
- README.rst: custom_README.rst.jj2
6+
- setup.py: custom_setup.py.jj2
7+
- .travis.yml: custom_travis.yml.jj2
188
- MANIFEST.in: MANIFEST.in
199
- "docs/source/index.rst": "docs/source/django-index.rst.jj2"
20-
- "tests/requirements.txt": "tests/requirements.txt"
21-
- output: CHANGELOG.rst
22-
configuration: changelog.yml
23-
template: CHANGELOG.rst.jj2
24-
- lint.sh: lint.script.jj2
10+
- "tests/requirements.txt": "tests/custom_requirements.txt.jj2"

.travis.yml

Lines changed: 38 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,55 @@ matrix:
5555
env: DJANGO_VERSION=1.11.15
5656

5757
stages:
58-
- test
5958
- lint
59+
- moban
60+
- test
61+
62+
.disable_global: &disable_global
63+
addons: false
64+
cache: false
65+
env: {}
66+
python: false
67+
before_install: false
68+
install: false
69+
before_script: false
70+
script: false
71+
after_success: false
72+
after_failure: false
73+
before_deploy: false
74+
deploy: false
75+
76+
.lint: &lint
77+
<<: *disable_global
78+
git:
79+
submodules: false
80+
python: 3.6
81+
stage: lint
82+
script: make lint
83+
84+
.moban: &moban
85+
<<: *disable_global
86+
python: 3.6
87+
stage: moban
88+
install: pip install moban>=0.0.4
89+
script:
90+
- moban
91+
- git diff --exit-code
92+
6093
jobs:
6194
include:
62-
- stage: lint
63-
python: 3.6
64-
script: make lint
95+
- *moban
96+
- *lint
6597

6698
stage: test
6799

68-
script: make test
69-
70100
before_install:
71101
- pip install Django==$DJANGO_VERSION
72-
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
73102
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
74103
mv min_requirements.txt requirements.txt ;
75104
fi
76-
- test ! -f rnd_requirements.txt || pip install --no-deps -r rnd_requirements.txt
105+
- test ! -f rnd_requirements.txt ||
106+
pip install --no-deps -r rnd_requirements.txt
77107
- test ! -f rnd_requirements.txt || pip install -r rnd_requirements.txt ;
78108
- pip install -r tests/requirements.txt
79109
script:

CHANGELOG.rst

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,38 @@ Change log
44
0.0.10 - 11.01.2018
55
--------------------------------------------------------------------------------
66

7-
Added
8-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7+
**Added**
98

109
#. `pyexcel-io#46 <https://github.com/webwares/pyexcel-io/issues/46>`_, expose
1110
`bulk_save` to django developers
1211

1312
0.0.9 - 12.07.2017
1413
--------------------------------------------------------------------------------
1514

16-
Added
17-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
15+
**Added**
1816

1917
#. bring isave_to_database and isave_book_to_database
2018

2119
0.0.8 - 07.07.2017
2220
--------------------------------------------------------------------------------
2321

24-
Added
25-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
22+
**Added**
2623

2724
#. `pyexcel#39 <https://github.com/webwares/pyexcel/issues/39>`_, explicitly
2825
seeking at 0
2926

3027
0.0.7 - 29.06.2017
3128
--------------------------------------------------------------------------------
3229

33-
Added
34-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
30+
**Added**
3531

3632
#. `pyexcel#38 <https://github.com/webwares/pyexcel/issues/38>`_, Support
3733
unicode code as download file name
3834

3935
0.0.6 - 12.22.2016
4036
--------------------------------------------------------------------------------
4137

42-
Updated
43-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
38+
**Updated**
4439

4540
#. `pyexcel#26 <https://github.com/webwares/pyexcel/issues/26>`_, raise ioerror
4641
if content is empty.
@@ -50,8 +45,7 @@ Updated
5045
0.0.5 - 26.08.2016
5146
--------------------------------------------------------------------------------
5247

53-
Added:
54-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
48+
**Added:**
5549

5650
#. Support for django 1.6.x
5751
#. Tested against django 1.10

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 'django-excel' 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.

README.rst

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,22 @@ django-excel - Let you focus on data, instead of file formats
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-webwares/django-excel.svg?branch=master
129
:target: http://travis-ci.org/pyexcel-webwares/django-excel
1310

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

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

@@ -24,7 +29,7 @@ Support the project
2429
================================================================================
2530

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

@@ -332,8 +337,6 @@ How to update test environment and update documentation
332337
Additional steps are required:
333338

334339
#. pip install moban
335-
#. git clone https://github.com/moremoban/setupmobans.git # generic setup
336-
#. git clone https://github.com/pyexcel/pyexcel-commons.git commons
337340
#. make your changes in `.moban.d` directory, then issue command `moban`
338341

339342
What is pyexcel-commons
@@ -346,18 +349,6 @@ What is .moban.d
346349

347350
`.moban.d` stores the specific meta data for the library.
348351

349-
Acceptance criteria
350-
-------------------
351-
352-
#. Has Test cases written
353-
#. Has all code lines tested
354-
#. Passes all Travis CI builds
355-
#. Has fair amount of documentation if your change is complex
356-
#. run 'make format' so as to confirm the pyexcel organisation's coding style
357-
#. Please update CHANGELOG.rst
358-
#. Please add yourself to CONTRIBUTORS.rst
359-
#. Agree on NEW BSD License for your contribution
360-
361352

362353

363354
License

docs/source/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ Support the project
220220
-----------------------
221221

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

lint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
pip install flake8
2+
flake8 . --exclude=.moban.d,docs,setup.py --builtins=unicode,xrange,long

0 commit comments

Comments
 (0)