Skip to content

Commit 084c325

Browse files
chfwchfw
committed
🔨 further code refactoring
1 parent 3425eeb commit 084c325

File tree

9 files changed

+87
-22
lines changed

9 files changed

+87
-22
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,9 +469,9 @@ cscope.out
469469
cscope.in.out
470470
cscope.po.out
471471

472+
472473
# pypi-mobans
473474
mobans/
474475
pypi-package/README.rst
475476
pypi-package/pypi_mobans/resources/
476477
pypi-package/test.sh
477-

‎.moban.dt/CUSTOM_README.rst.jj2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Organisations using it:
1010

1111
- `pyexcel <https://github.com/pyexcel/pyexcel>`_.
1212
- `coala <https://github.com/coala/coala>`_.
13+
- `pyecharts <https://github.com/pyecharts/pyecharts>`_.
14+
- `echarts-maps <https://github.com/echarts-maps>`_.
1315

1416
Features
1517
================================================================================
@@ -29,6 +31,8 @@ setup.py
2931
{% endblock %}
3032

3133
{% block bottom_block %}
34+
{% block github_note %}
35+
{% endblock %}
3236
Notes
3337
================================================================================
3438

‎.moban.dt/INDEX_README.rst.jj2

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{% extends "CUSTOM_README.rst.jj2" %}
2+
3+
{% block github_note %}
4+
File organisation
5+
================================================================================
6+
7+
`mobans` lives in `templates` folder. python package lives in `pypi-package`
8+
folder. `upstreaming.yml` is used to upstream sphinx templates into pypi-mobans.
9+
10+
11+
Everything else are meta data.
12+
13+
{% endblock %}

‎.moban.dt/pypi_gitignore.jj2

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{% extends "gitignore.jj2" %}
2+
3+
{%block extra %}
4+
# pypi-mobans
5+
mobans/
6+
pypi-package/README.rst
7+
pypi-package/pypi_mobans/resources/
8+
pypi-package/test.sh
9+
{%endblock%}

‎.moban.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
configuration:
2+
template_dir:
3+
- ".moban.dt"
4+
- "mobans/templates"
5+
configuration: "pypi-mobans.yml"
6+
targets:
7+
- .gitignore: pypi_gitignore.jj2
8+
- LICENSE: NEW_BSD_LICENSE.jj2
9+
- README.rst: INDEX_README.rst.jj2
10+
- "pypi-package/README.rst": CUSTOM_README.rst.jj2
11+
- "pypi-package/LICENSE": NEW_BSD_LICENSE.jj2
12+
- "pypi-package/setup.py": custom_setup.py.jj2
13+
- "pypi-package/requirements.txt": requirements.txt.jj2
14+
- "pypi-package/tests/requirements.txt": "tests/custom_requirements.txt.jj2"
15+
- "pypi-package/docs/source/conf.py": "docs/source/conf.py.jj2"
16+
- "pypi-package/test.sh": test.script.jj2
17+
- "pypi-package/pypi_mobans/_version.py": "_version.py.jj2"
18+
copy:
19+
- "pypi-package/pypi_mobans/resources/templates": ../templates/**

‎LICENSE

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
Copyright (c) 2018 by Onni Software Ltd. and its contributors
2+
All rights reserved.
3+
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:
7+
8+
* Redistributions of source code must retain the above copyright notice, this
9+
list of conditions and the following disclaimer.
10+
11+
* Redistributions in binary form must reproduce the above copyright notice,
12+
this list of conditions and the following disclaimer in the documentation
13+
and/or other materials provided with the distribution.
14+
15+
* Neither the name of 'pypi-mobans' nor the names of the contributors
16+
may be used to endorse or promote products derived from this software
17+
without specific prior written permission.
18+
19+
THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
20+
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
21+
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
23+
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
24+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
25+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
26+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
27+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
28+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
29+
SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
30+
DAMAGE.

‎README.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Organisations using it:
1818

1919
- `pyexcel <https://github.com/pyexcel/pyexcel>`_.
2020
- `coala <https://github.com/coala/coala>`_.
21+
- `pyecharts <https://github.com/pyecharts/pyecharts>`_.
22+
- `echarts-maps <https://github.com/echarts-maps>`_.
2123

2224
Features
2325
================================================================================
@@ -45,6 +47,15 @@ You can get it:
4547
$ git clone https://github.com/moremoban/pypi-mobans.git
4648
$ cd pypi-mobans
4749
50+
File organisation
51+
================================================================================
52+
53+
`mobans` lives in `templates` folder. python package lives in `pypi-package`
54+
folder. `upstreaming.yml` is used to upstream sphinx templates into pypi-mobans.
55+
56+
57+
Everything else are meta data.
58+
4859
Notes
4960
================================================================================
5061

‎pypi-package/.moban.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎local.yml renamed to ‎upstreaming.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ configuration:
44
- .moban.d/
55
- templates
66
- ../sphinx-quickstart-templates
7-
targets:
8-
- .gitignore: gitignore.jj2
9-
- LICENSE: NEW_BSD_LICENSE.jj2
10-
- README.rst: CUSTOM_README.rst.jj2
117
copy:
128
- templates/docs/Makefile.jj2: Makefile.new_t
139
- templates/docs/make.bat.jj2: make.bat.new_t

0 commit comments

Comments
 (0)