utilize consoleoptions

MANIFEST.in

@@ -0,0 +1 @@
+include requirements.txt

requirements.txt

@@ -0,0 +1,4 @@
+pandas
+consoleoptions
+circlify
+matplotlib

setup.py

@@ -2,9 +2,14 @@
 with open("README.md", "r", encoding="utf-8") as fh:
   long_description = fh.read()
 
+
+def _requires_from_file(filename):
+  return open(filename).read().splitlines()
+
+
 setuptools.setup(
     name="yknsshanalysis",
-    version="1.2.0",
+    version="1.3.0",
     author="Yuki NAKAMURA",
     author_email="naka_yk@live.jp",
     description="Analyze auth.log",
@@ -23,6 +28,7 @@
     py_modules=['yknsshanalysis'],
     packages=setuptools.find_packages(where="src"),
     python_requires=">=3.6",
+    install_requires=_requires_from_file('requirements.txt'),
     entry_points={
         'console_scripts': [
             'yknsshanalysis = yknsshanalysis:main'

src/yknsshanalysis.py

@@ -6,20 +6,11 @@
 import circlify
 import matplotlib.pyplot as plt
 import pickle
-from option import get_option as get_option
+import consoleoptions as get_option
 
 whois_list = ["http://ipinfo.io/xxx", "http://ipwhois.app/json/xxx", "https://ipapi.co/xxx/json"]
 
 
-def _trim(string):
-  if len(string) == 0:
-    return ''
-  elif string[0] == '\'' or string[0] == '\"':
-    return string[1:-1]
-  else:
-    return string
-
-
 def main(args=sys.argv):
   # オプションの初期値を設定
   optionDict = {}