Skip to content

Commit f25f7d2

Browse files
committed
Merge branch 'hotfix/0.7.1'
2 parents 099019d + 2f1974f commit f25f7d2

File tree

5 files changed

+57
-6
lines changed

5 files changed

+57
-6
lines changed

ckipnlp/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
__copyright__ = '2018-2020 CKIP Lab'
77

88
__title__ = 'CKIPNLP'
9-
__version__ = '0.7.0'
9+
__version__ = '0.7.1'
1010
__description__ = 'CKIP CoreNLP Wrappers'
1111
__license__ = 'CC BY-NC-SA 4.0'
1212

docs/_static/custom.css

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
.wy-nav-content {
2-
max-width: 1280px;
2+
max-width: 1280px;
3+
}
4+
5+
.rst-content p.rubric {
6+
font-size: 125%;
37
}

docs/_templates/package.rst_t

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{%- macro automodule(modname, options) -%}
2+
.. automodule:: {{ modname }}
3+
{%- for option in options %}
4+
:{{ option }}:
5+
{%- endfor %}
6+
{%- endmacro %}
7+
8+
{%- macro toctree(docnames) -%}
9+
.. toctree::
10+
{% for docname in docnames %}
11+
{{ docname }}
12+
{%- endfor %}
13+
{%- endmacro %}
14+
15+
{%- if is_namespace %}
16+
{{- [pkgname, "namespace"] | join(" ") | e | heading }}
17+
{% else %}
18+
{{- [pkgname, "package"] | join(" ") | e | heading }}
19+
{% endif %}
20+
21+
{%- if modulefirst and not is_namespace %}
22+
{{ automodule(pkgname, automodule_options) }}
23+
{% endif %}
24+
25+
{%- if subpackages %}
26+
.. rubric:: Subpackages
27+
28+
{{ toctree(subpackages) }}
29+
{% endif %}
30+
31+
{%- if submodules %}
32+
.. rubric:: Submodules
33+
34+
{% if separatemodules %}
35+
{{ toctree(submodules) }}
36+
{%- else %}
37+
{%- for submodule in submodules %}
38+
{% if show_headings %}
39+
{{- [submodule, "module"] | join(" ") | e | heading(2) }}
40+
{% endif %}
41+
{{ automodule(submodule, automodule_options) }}
42+
{% endfor %}
43+
{%- endif %}
44+
{% endif %}
45+
46+
{%- if not modulefirst and not is_namespace %}
47+
.. rubric:: Module contents
48+
49+
{{ automodule(pkgname, automodule_options) }}
50+
{% endif %}

docs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282

8383
def run_apidoc(_):
8484
from sphinx.ext.apidoc import main
85-
main(['-feTM', '-o', '_api', '../ckipnlp'])
85+
main(['-feTM', '-t', './_templates', '-o', '_api', '../ckipnlp'])
8686

8787
def setup(app):
8888
app.connect('builder-inited', run_apidoc)

docs/index.rst

-3
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,16 @@ CKIP CoreNLP Wrappers
33

44
.. toctree::
55
:caption: Overview
6-
:maxdepth: 2
76

87
src/readme
98

109
.. toctree::
11-
:maxdepth: 2
1210
:caption: Contents
1311

1412
_api/ckipnlp
1513

1614
.. toctree::
1715
:caption: Appendix
18-
:maxdepth: 2
1916

2017
src/todo
2118
genindex

0 commit comments

Comments
 (0)