Skip to content

Commit 0c48549

Browse files
emfomyemfomy
committed
Merge branch 'release/0.6.2'
2 parents d74cfb2 + 369535b commit 0c48549

File tree

14 files changed

+22
-20
lines changed

14 files changed

+22
-20
lines changed

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2018-2019 CKIP Lab. All rights reserved.
1+
Copyright (c) 2018-2019 CKIP Lab.
22

33
This work is licensed under the Creative Commons
44
Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy

‎Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
PY = python
22
RM = rm -rf
33
LINT = pylint --rcfile=./.pylintrc
4+
TWINE = twine
45

56
.PHONY: all check dist sdist test lint doc upload clean
67

@@ -21,7 +22,7 @@ doc:
2122
( cd docs ; make clean ; make html )
2223

2324
upload: dist check
24-
twine upload --repository-url https://test.pypi.org/legacy/ dist/*.tar.gz --verbose
25+
$(TWINE) upload --repository-url https://test.pypi.org/legacy/ dist/*.tar.gz --verbose
2526

2627
clean:
2728
( cd docs ; make clean )

‎README.rst

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,11 @@ http://ckipnlp.readthedocs.io/
6262
.. |ReadTheDocs Home| image:: https://img.shields.io/website/https/ckipnlp.readthedocs.io.svg?maxAge=3600&up_message=online&down_message=offline
6363
:target: http://ckipnlp.readthedocs.io
6464

65-
Author
66-
------
65+
Author / Maintainer
66+
-------------------
6767

68-
* Mu Yang <http://muyang.pro>
68+
* `Mu Yang <http://muyang.pro>`_ at `CKIP <https://ckip.iis.sinica.edu.tw>`_ (Author & Maintainer)
69+
* `Wei-Yun Ma <https://www.iis.sinica.edu.tw/pages/ma/>`_ at `CKIP <https://ckip.iis.sinica.edu.tw>`_ (Maintainer)
6970

7071
Requirements
7172
------------
@@ -236,7 +237,7 @@ License
236237

237238
|CC BY-NC-SA 4.0|
238239

239-
Copyright (c) 2018-2019 CKIP Lab under the `CC-BY-NC-SA 4.0 License <http://creativecommons.org/licenses/by-nc-sa/4.0/>`_. All rights reserved.
240+
Copyright (c) 2018-2019 `CKIP Lab <https://ckip.iis.sinica.edu.tw>`_ under the `CC BY-NC-SA 4.0 License <http://creativecommons.org/licenses/by-nc-sa/4.0/>`_.
240241

241242
.. |CC BY-NC-SA 4.0| image:: https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png
242243
:target: http://creativecommons.org/licenses/by-nc-sa/4.0/

‎ckipnlp/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
__copyright__ = '2018-2019 CKIP Lab'
77

88
__title__ = 'CKIPNLP'
9-
__version__ = '0.6.1.post0'
9+
__version__ = '0.6.2'
1010
__description__ = 'CKIP CoreNLP Wrappers'
11-
__license__ = 'CC-BY-NC-SA 4.0'
11+
__license__ = 'CC BY-NC-SA 4.0'
1212

1313
__url__ = 'https://ckipnlp.readthedocs.io'
1414
__download_url__ = __url__+'/tarball/'+__version__

‎ckipnlp/parser/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
__author__ = 'Mu Yang <http://muyang.pro>'
55
__copyright__ = '2018-2019 CKIP Lab'
6-
__license__ = 'CC-BY-NC-SA 4.0'
6+
__license__ = 'CC BY-NC-SA 4.0'
77

88
import os as _os
99
import tempfile as _tempfile

‎ckipnlp/util/ini.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
__author__ = 'Mu Yang <http://muyang.pro>'
55
__copyright__ = '2018-2019 CKIP Lab'
6-
__license__ = 'CC-BY-NC-SA 4.0'
6+
__license__ = 'CC BY-NC-SA 4.0'
77

88
import datetime as _datetime
99
import os as _os

‎ckipnlp/util/parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
__author__ = 'Mu Yang <http://muyang.pro>'
55
__copyright__ = '2018-2019 CKIP Lab'
6-
__license__ = 'CC-BY-NC-SA 4.0'
6+
__license__ = 'CC BY-NC-SA 4.0'
77

88
import collections as _collections
99
import itertools as _itertools

‎ckipnlp/util/ws.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
__author__ = 'Mu Yang <http://muyang.pro>'
55
__copyright__ = '2018-2019 CKIP Lab'
6-
__license__ = 'CC-BY-NC-SA 4.0'
6+
__license__ = 'CC BY-NC-SA 4.0'
77

88
import collections as _collections
99
import json as _json

‎ckipnlp/ws/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
__author__ = 'Mu Yang <http://muyang.pro>'
55
__copyright__ = '2018-2019 CKIP Lab'
6-
__license__ = 'CC-BY-NC-SA 4.0'
6+
__license__ = 'CC BY-NC-SA 4.0'
77

88
import os as _os
99
import tempfile as _tempfile

‎setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
__author__ = 'Mu Yang <http://muyang.pro>'
55
__copyright__ = '2018-2019 CKIP Lab'
6-
__license__ = 'CC-BY-NC-SA 4.0'
6+
__license__ = 'CC BY-NC-SA 4.0'
77

88
from setuptools import dist
99
dist.Distribution().fetch_build_eggs([
@@ -32,7 +32,7 @@
3232

3333
import ckipnlp as about
3434

35-
with open('README.rst') as fin:
35+
with open('README.rst', encoding='utf-8') as fin:
3636
readme = fin.read()
3737

3838
################################################################################
@@ -227,7 +227,7 @@ def __init__(self, *args, **kwargs):
227227
python_requires='>=3.5',
228228
packages=find_namespace_packages(include=['ckipnlp', 'ckipnlp.*', 'ckipws', 'ckipparser',]),
229229
install_requires=[
230-
'treelib>=1.5.5',
230+
'treelib>=1.5',
231231
],
232232
ext_modules=cythonize(
233233
[

‎src/parser/cckipparser.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
__author__ = 'Mu Yang <http://muyang.pro>'
44
__copyright__ = '2018-2019 CKIP Lab'
5-
__license__ = 'CC-BY-NC-SA 4.0'
5+
__license__ = 'CC BY-NC-SA 4.0'
66

77
cdef extern:
88

‎src/parser/ckipparser.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
__author__ = 'Mu Yang <http://muyang.pro>'
55
__copyright__ = '2018-2019 CKIP Lab'
6-
__license__ = 'CC-BY-NC-SA 4.0'
6+
__license__ = 'CC BY-NC-SA 4.0'
77

88
cimport src.parser.cckipparser as cckipparser
99
from libc.stdlib cimport malloc, free

‎src/ws/cckipws.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
__author__ = 'Mu Yang <http://muyang.pro>'
44
__copyright__ = '2018-2019 CKIP Lab'
5-
__license__ = 'CC-BY-NC-SA 4.0'
5+
__license__ = 'CC BY-NC-SA 4.0'
66

77
cdef extern:
88

‎src/ws/ckipws.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
__author__ = 'Mu Yang <http://muyang.pro>'
55
__copyright__ = '2018-2019 CKIP Lab'
6-
__license__ = 'CC-BY-NC-SA 4.0'
6+
__license__ = 'CC BY-NC-SA 4.0'
77

88
cimport src.ws.cckipws as cckipws
99
from libc.stdlib cimport malloc, free

0 commit comments

Comments
 (0)