Merge branch 'hotfix/1.1.2'

ckiplab · Nov 3, 2020 · 1213330 · 1213330
2 parents d62c516 + 24b3868
commit 1213330
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 24 deletions.
diff --git a/DEVELOP.md b/DEVELOP.md
@@ -1,8 +1,12 @@
 # Release TODO
 - change version number
-- make clean
-- make lint
-- make doc
-- make tox
-- make tox-report
-- make upload
+
+- >> make clean
+- >> make lint
+- >> make doc
+- >> make tox
+- >> make tox-report
+
+- merge to master branch
+- >> make clean
+- >> make upload
diff --git a/ckip_classic/__init__.py b/ckip_classic/__init__.py
@@ -6,7 +6,7 @@
 __copyright__ = '2018-2020 CKIP Lab'
 
 __title__ = 'CkipClassic'
-__version__ = '1.1.1'
+__version__ = '1.1.2'
 __description__ = 'CKIP Classic NLP Tools'
 __license__ = 'CC BY-NC-SA 4.0'
 

diff --git a/ckip_classic/client/__init__.py b/ckip_classic/client/__init__.py
@@ -5,6 +5,9 @@
 __copyright__ = '2018-2020 CKIP Lab'
 __license__ = 'CC BY-NC-SA 4.0'
 
+import os as _os
+import warnings as _warnings
+
 from ._parser import CkipParserSocket
 
 ################################################################################################################################
@@ -15,17 +18,26 @@ class CkipParserClient:
     Parameters
     ----------
         username : str
-            the username.
+            the username (default to the environment variable `$CKIPPARSER_USERNAME`).
         password : str
-            the password.
+            the password (default to the environment variable `$CKIPPARSER_PASSWORD`).
 
     Note
     ----
         One may register an account at http://parser.iis.sinica.edu.tw/v1/reg.exe
 
     """
 
-    def __init__(self, *, username, password):
+    def __init__(self, *,
+            username=_os.getenv('CKIPPARSER_USERNAME'),
+            password=_os.getenv('CKIPPARSER_PASSWORD'),
+        ):
+
+        if username is None:
+            _warnings.warn('Invalid username (%s)' % username)
+        if password is None:
+            _warnings.warn('Invalid password (%s)' % password)
+
         self.socket = CkipParserSocket(username=username, password=password)
 
     def __call__(self, text):

diff --git a/ckip_classic/ini.py b/ckip_classic/ini.py
@@ -13,8 +13,7 @@
 
 import ckip_classic as _about
 
-def create_ws_lex(*lex_list
-):
+def create_ws_lex(*lex_list):
     """Generate CKIP word segmentation lexicon file.
 
     Parameters

diff --git a/test/.env.example b/test/.env.example
@@ -1,2 +1,2 @@
-CLIENT_USERNAME=
-CLIENT_PASSWORD=
+CKIPPARSER_USERNAME=
+CKIPPARSER_PASSWORD=
diff --git a/test/requirements.txt b/test/requirements.txt
@@ -1,2 +1 @@
 ..
-python-dotenv
diff --git a/test/script/test_parser_client.py b/test/script/test_parser_client.py
@@ -7,19 +7,11 @@
 
 import os
 
-from dotenv import load_dotenv
-
 from ckip_classic.client import CkipParserClient
 
 ################################################################################################################################
 
-load_dotenv()
-USERNAME = os.getenv('CLIENT_USERNAME')
-PASSWORD = os.getenv('CLIENT_PASSWORD')
-
-################################################################################################################################
-
-parser = CkipParserClient(username=USERNAME, password=PASSWORD, )
+parser = CkipParserClient()
 
 text_in = [
     '中文字(Na)　耶(T)　，(COMMACATEGORY)',

diff --git a/test/tox.ini b/test/tox.ini
@@ -50,9 +50,11 @@ commands =
 [testenv:py36-client]
 deps =
 	{[testenv]deps}
+	python-dotenv[cli]
 	-rrequirements.txt
 
 commands =
+	dotenv -f {toxinidir}/.env run \
 	pytest \
 	{toxinidir}/script/test_parser_client.py \
 	{env:NO_COV:--cov=ckip_classic.client} \