Merge branch 'release/1.2.0'

ckiplab · Jan 20, 2021 · 68a9862 · 68a9862
2 parents 1213330 + ea8acc6
commit 68a9862
Show file tree

Hide file tree

Showing 22 changed files with 2,628 additions and 32 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ TWINE = twine
 TOX = tox
 LINT = pylint --rcfile=./.pylintrc
 
-.PHONY: all check dist sdist test tox tox-v tox-report lint doc upload clean
+.PHONY: all check dist sdist test tox tox-v tox-vv tox-report lint doc upload clean
 
 all: dist check test
 
@@ -22,7 +22,7 @@ check:
 	$(TWINE) check dist/*
 	# $(PY) setup.py check -r -s
 
-tox tox-v tox-report:
+tox tox-v tox-vv tox-report:
 	( cd test ; make $@ )
 
 doc:

diff --git a/README.rst b/README.rst
@@ -285,9 +285,9 @@ FAQ
 License
 =======
 
-|CC BY-NC-SA 4.0|
+|GPL-3.0|
 
-Copyright (c) 2018-2020 `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/>`__.
+Copyright (c) 2018-2020 `CKIP Lab <https://ckip.iis.sinica.edu.tw>`__ under the `GPL-3.0 License <https://www.gnu.org/licenses/gpl-3.0.html>`__.
 
-.. |CC BY-NC-SA 4.0| image:: https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png
-   :target: http://creativecommons.org/licenses/by-nc-sa/4.0/
+.. |GPL-3.0| image:: https://www.gnu.org/graphics/gplv3-with-text-136x68.png
+   :target: https://www.gnu.org/licenses/gpl-3.0.html
diff --git a/ckip_classic/__init__.py b/ckip_classic/__init__.py
@@ -6,9 +6,9 @@
 __copyright__ = '2018-2020 CKIP Lab'
 
 __title__ = 'CkipClassic'
-__version__ = '1.1.2'
+__version__ = '1.2.0'
 __description__ = 'CKIP Classic NLP Tools'
-__license__ = 'CC BY-NC-SA 4.0'
+__license__ = 'GPL-3.0'
 
 __url__ = 'https://ckip-classic.readthedocs.io'
 __download_url__ = __url__+'/tarball/'+__version__
diff --git a/ckip_classic/client/__init__.py b/ckip_classic/client/__init__.py
@@ -3,7 +3,7 @@
 
 __author__ = 'Mu Yang <http://muyang.pro>'
 __copyright__ = '2018-2020 CKIP Lab'
-__license__ = 'CC BY-NC-SA 4.0'
+__license__ = 'GPL-3.0'
 
 import os as _os
 import warnings as _warnings
@@ -18,9 +18,9 @@ class CkipParserClient:
     Parameters
     ----------
         username : str
-            the username (default to the environment variable `$CKIPPARSER_USERNAME`).
+            the username (default to the environment variable ``$CKIPPARSER_USERNAME``).
         password : str
-            the password (default to the environment variable `$CKIPPARSER_PASSWORD`).
+            the password (default to the environment variable ``$CKIPPARSER_PASSWORD``).
 
     Note
     ----

diff --git a/ckip_classic/client/_parser.py b/ckip_classic/client/_parser.py
@@ -3,7 +3,7 @@
 
 __author__ = 'Mu Yang <http://muyang.pro>'
 __copyright__ = '2018-2020 CKIP Lab'
-__license__ = 'CC BY-NC-SA 4.0'
+__license__ = 'GPL-3.0'
 
 import json
 import socket

diff --git a/ckip_classic/ini.py b/ckip_classic/ini.py
@@ -3,7 +3,7 @@
 
 __author__ = 'Mu Yang <http://muyang.pro>'
 __copyright__ = '2018-2020 CKIP Lab'
-__license__ = 'CC BY-NC-SA 4.0'
+__license__ = 'GPL-3.0'
 
 import datetime as _datetime
 import os as _os

diff --git a/ckip_classic/parser.py b/ckip_classic/parser.py
@@ -3,7 +3,7 @@
 
 __author__ = 'Mu Yang <http://muyang.pro>'
 __copyright__ = '2018-2020 CKIP Lab'
-__license__ = 'CC BY-NC-SA 4.0'
+__license__ = 'GPL-3.0'
 
 import os as _os
 import warnings as _warnings

diff --git a/ckip_classic/ws.py b/ckip_classic/ws.py
@@ -3,7 +3,7 @@
 
 __author__ = 'Mu Yang <http://muyang.pro>'
 __copyright__ = '2018-2020 CKIP Lab'
-__license__ = 'CC BY-NC-SA 4.0'
+__license__ = 'GPL-3.0'
 
 import os as _os
 

diff --git a/docs/_static/custom.css b/docs/_static/custom.css
@@ -1,7 +1,26 @@
-.wy-nav-content {
-  max-width: 1280px;
+/* header */
+
+h1 {
+	font-size: 250%;
+
+	display: inline-block;
+	border-bottom: 3px solid #2980b9;
 }
 
+/* content */
+
 .rst-content p.rubric {
-  font-size: 125%;
+	font-size: 125%;
+}
+
+.rst-content table.docutils th p {
+	margin-bottom: 0;
+}
+
+.rst-content tt.literal, .rst-content tt.literal, .rst-content code.literal {
+	color: #0057A9;
+}
+
+.wy-nav-content {
+	max-width: 1280px;
 }
diff --git a/docs/conf.py b/docs/conf.py
@@ -67,6 +67,9 @@
 html_extra_path = ['../LICENSE']
 html_css_files = ['./custom.css']
 
+html_logo    = 'image/ckip_logo.svg'
+html_favicon = 'image/ckip_favicon.ico'
+
 # -- Settings of autodoc -----------------------------------------------------
 
 autodoc_member_order = 'bysource'

diff --git a/docs/image/ckip_favicon.ico b/docs/image/ckip_favicon.ico
diff --git a/docs/image/ckip_logo.svg b/docs/image/ckip_logo.svg
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 __author__ = 'Mu Yang <http://muyang.pro>'
 __copyright__ = '2018-2020 CKIP Lab'
-__license__ = 'CC BY-NC-SA 4.0'
+__license__ = 'GPL-3.0'
 
 from setuptools import dist
 dist.Distribution().fetch_build_eggs([
@@ -61,7 +61,7 @@ def main():
             'Programming Language :: Python :: 3.8',
             'Programming Language :: Python :: 3 :: Only',
             'Programming Language :: Cython',
-            'License :: Free for non-commercial use',
+            'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
             'Operating System :: POSIX :: Linux',
             'Natural Language :: Chinese (Traditional)',
         ],

diff --git a/src/parser/cckipparser.pxd b/src/parser/cckipparser.pxd
@@ -2,7 +2,7 @@
 
 __author__ = 'Mu Yang <http://muyang.pro>'
 __copyright__ = '2018-2020 CKIP Lab'
-__license__ = 'CC BY-NC-SA 4.0'
+__license__ = 'GPL-3.0'
 
 cdef extern:
 

diff --git a/src/parser/ckipparser.pyx b/src/parser/ckipparser.pyx
@@ -3,7 +3,7 @@
 
 __author__ = 'Mu Yang <http://muyang.pro>'
 __copyright__ = '2018-2020 CKIP Lab'
-__license__ = 'CC BY-NC-SA 4.0'
+__license__ = 'GPL-3.0'
 
 cimport src.parser.cckipparser as cckipparser
 cimport cython

diff --git a/src/ws/cckipws.pxd b/src/ws/cckipws.pxd
@@ -2,7 +2,7 @@
 
 __author__ = 'Mu Yang <http://muyang.pro>'
 __copyright__ = '2018-2020 CKIP Lab'
-__license__ = 'CC BY-NC-SA 4.0'
+__license__ = 'GPL-3.0'
 
 cdef extern:
 

diff --git a/src/ws/ckipws.pyx b/src/ws/ckipws.pyx
@@ -3,7 +3,7 @@
 
 __author__ = 'Mu Yang <http://muyang.pro>'
 __copyright__ = '2018-2020 CKIP Lab'
-__license__ = 'CC BY-NC-SA 4.0'
+__license__ = 'GPL-3.0'
 
 cimport src.ws.cckipws as cckipws
 cimport cython

diff --git a/test/Makefile b/test/Makefile
@@ -11,6 +11,10 @@ tox-v:
 	NO_COV= $(TOX) -e py36-client -- -v
 	NO_COV= $(TOX) -e py{36,37,38} -- -v
 
+tox-vv:
+	NO_COV= $(TOX) -e py36-client -- -vv
+	NO_COV= $(TOX) -e py36 -- -vv
+
 tox-report:
 	- $(TOX) -p -e clean,py36,py36-client,report -- --cov-append
 	python3.7 -m http.server --directory .test/htmlcov/ 3000

diff --git a/test/script/test_parser.py b/test/script/test_parser.py
@@ -3,7 +3,7 @@
 
 __author__ = 'Mu Yang <http://muyang.pro>'
 __copyright__ = '2018-2020 CKIP Lab'
-__license__ = 'CC BY-NC-SA 4.0'
+__license__ = 'GPL-3.0'
 
 import os
 import tempfile

diff --git a/test/script/test_parser_client.py b/test/script/test_parser_client.py
@@ -3,7 +3,7 @@
 
 __author__ = 'Mu Yang <http://muyang.pro>'
 __copyright__ = '2018-2020 CKIP Lab'
-__license__ = 'CC BY-NC-SA 4.0'
+__license__ = 'GPL-3.0'
 
 import os
 

diff --git a/test/script/test_ws.py b/test/script/test_ws.py
@@ -3,7 +3,7 @@
 
 __author__ = 'Mu Yang <http://muyang.pro>'
 __copyright__ = '2018-2020 CKIP Lab'
-__license__ = 'CC BY-NC-SA 4.0'
+__license__ = 'GPL-3.0'
 
 import os
 import tempfile