Merge pull request #5 from yuji38kwmt/update-slackclient

updaate slackclient 2.5 -> 2.6

.travis.yml

@@ -9,6 +9,7 @@ install:
   - poetry install
 
 script:
+   - poetry run mypy slack_primitive_cli
    - poetry run flake8 slack_primitive_cli
 branches:
   only:

Makefile

@@ -13,6 +13,7 @@ format:
 	poetry run isort --verbose --recursive ${TARGET}
 
 lint:
+	poetry run mypy ${TARGET}
 	poetry run flake8 ${TARGET}
 
 publish:

mypy.ini

@@ -0,0 +1,2 @@
+[mypy]
+ignore_missing_imports = True

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "slack-primitive-cli"
-version = "0.1.1"
+version = "0.1.2"
 description = "Primitive Slack CLI"
 authors = ["yuji38kwmt <yuji38kwmt@gmail.com>"]
 maintainers = ["yuji38kwmt <yuji38kwmt@gmail.com>"]
@@ -23,7 +23,7 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.6"
-slackclient = "^2"
+slackclient = "^2.6"
 click = "^7"
 click-option-group = "*"
 
@@ -32,14 +32,11 @@ flake8 = "*"
 autoflake = "*"
 isort = "*"
 black = {version = "^19.10b0", allow-prereleases = true}
+mypy = "*"
 
 [tool.poetry.scripts]
 slackcli = "slack_primitive_cli.__main__:cli"
 
-[build-system]
-requires = ["poetry>=0.12"]
-build-backend = "poetry.masonry.api"
-
 [tool.black]
 line-length = 120
 
@@ -52,3 +49,7 @@ multi_line_output=3
 include_trailing_comma=true
 force_grid_wrap=0
 use_parentheses=true
+[build-system]
+requires = ["poetry>=0.12"]
+build-backend = "poetry.masonry.api"
+

slack_primitive_cli/__version__.py

@@ -1 +1 @@
-__version__ = "0.1.1"
+__version__ = "0.1.2"

slack_primitive_cli/command/files.py

@@ -1,5 +1,4 @@
 import os
-from typing import Any, Optional
 
 import click
 import slack
@@ -23,25 +22,16 @@ def upload(token, channels, file, content, filename, filetype, initial_comment,
     if filename is None and file is not None:
         filename = os.path.basename(file)
 
-    def _update_kwargs(key: str, value: Optional[Any]):
-        if value is not None:
-            kwargs[key] = value
-
-    kwargs = dict(channels=channels)
-    _update_kwargs("file", file)
-    _update_kwargs("content", content)
-    _update_kwargs("filename", filename)
-    _update_kwargs("filetype", filetype)
-    _update_kwargs("initial_comment", initial_comment)
-    _update_kwargs("thread_ts", thread_ts)
-    _update_kwargs("title", title)
-
-    # Noneの引数を渡すと、以下のエラーが発生するため、Noneの引数は`files_upload`メソッドに渡さないようにする
-    # TypeError: Can not serialize value type: <class 'NoneType'>
-    if title is not None:
-        kwargs["title"] = title
-
-    response = client.files_upload(**kwargs)
+    response = client.files_upload(
+        channels=channels,
+        file=file,
+        content=content,
+        filename=filename,
+        filetype=filetype,
+        initial_comment=initial_comment,
+        thread_ts=thread_ts,
+        title=title,
+    )
     print(response)
     return response