Merge pull request #662 from seratch/black-flake8-consistency

Make the flake8 and black settings consistent

Author: seratch

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# change black settings
+0e4cd56b69e8f83166cd262f762802b7f18c3d21

pyproject.toml

@@ -0,0 +1,4 @@
+# black project prefers pyproject.toml
+# that's why we have this file in addition to other setting files
+[tool.black]
+line-length = 125

scripts/build_pypi_package.sh

@@ -5,7 +5,6 @@ cd ${script_dir}/..
 rm -rf ./slack_bolt.egg-info
 
 pip install -U pip && \
-  python setup.py test && \
   pip install twine wheel && \
   rm -rf dist/ build/ slack_bolt.egg-info/ && \
   python setup.py sdist bdist_wheel && \

setup.cfg

@@ -2,4 +2,4 @@
 universal = 1
 
 [aliases]
-test=pytest
+test=pytest

slack_bolt/adapter/aws_lambda/chalice_handler.py

@@ -21,9 +21,7 @@ class ChaliceSlackRequestHandler:
     def __init__(self, app: App, chalice: Chalice, lambda_client: Optional[BaseClient] = None):  # type: ignore
         self.app = app
         self.chalice = chalice
-        self.logger = get_bolt_app_logger(
-            app.name, ChaliceSlackRequestHandler, app.logger
-        )
+        self.logger = get_bolt_app_logger(app.name, ChaliceSlackRequestHandler, app.logger)
 
         if getenv("AWS_CHALICE_CLI_MODE") == "true" and lambda_client is None:
             try:
@@ -64,10 +62,7 @@ def handle(self, request: Request):
                 bolt_req: BoltRequest = to_bolt_request(request, body)
                 query = bolt_req.query
                 is_callback = query is not None and (
-                    (
-                        _first_value(query, "code") is not None
-                        and _first_value(query, "state") is not None
-                    )
+                    (_first_value(query, "code") is not None and _first_value(query, "state") is not None)
                     or _first_value(query, "error") is not None
                 )
                 if is_callback:

slack_bolt/adapter/aws_lambda/chalice_lazy_listener_runner.py

@@ -20,9 +20,7 @@ def start(self, function: Callable[..., None], request: BoltRequest) -> None:
 
         chalice_request: dict = request.context["chalice_request"]
         request.headers["x-slack-bolt-lazy-only"] = ["1"]
-        request.headers["x-slack-bolt-lazy-function-name"] = [
-            request.lazy_function_name
-        ]
+        request.headers["x-slack-bolt-lazy-function-name"] = [request.lazy_function_name]
         payload = {
             "method": "NONE",
             "headers": {k: v[0] for k, v in request.headers.items()},

slack_bolt/adapter/aws_lambda/handler.py

@@ -15,9 +15,7 @@ class SlackRequestHandler:
     def __init__(self, app: App):  # type: ignore
         self.app = app
         self.logger = get_bolt_app_logger(app.name, SlackRequestHandler, app.logger)
-        self.app.listener_runner.lazy_listener_runner = LambdaLazyListenerRunner(
-            self.logger
-        )
+        self.app.listener_runner.lazy_listener_runner = LambdaLazyListenerRunner(self.logger)
         if self.app.oauth_flow is not None:
             self.app.oauth_flow.settings.redirect_uri_page_renderer.install_path = "?"
 
@@ -44,10 +42,7 @@ def handle(self, event, context):
                 bolt_req: BoltRequest = to_bolt_request(event)
                 query = bolt_req.query
                 is_callback = query is not None and (
-                    (
-                        _first_value(query, "code") is not None
-                        and _first_value(query, "state") is not None
-                    )
+                    (_first_value(query, "code") is not None and _first_value(query, "state") is not None)
                     or _first_value(query, "error") is not None
                 )
                 if is_callback:

slack_bolt/adapter/aws_lambda/lambda_s3_oauth_flow.py

@@ -30,26 +30,18 @@ def __init__(
             client_id=os.environ["SLACK_CLIENT_ID"],
             client_secret=os.environ["SLACK_CLIENT_SECRET"],
         )
-        oauth_state_bucket_name = (
-            oauth_state_bucket_name or os.environ["SLACK_STATE_S3_BUCKET_NAME"]
-        )
-        installation_bucket_name = (
-            installation_bucket_name or os.environ["SLACK_INSTALLATION_S3_BUCKET_NAME"]
-        )
+        oauth_state_bucket_name = oauth_state_bucket_name or os.environ["SLACK_STATE_S3_BUCKET_NAME"]
+        installation_bucket_name = installation_bucket_name or os.environ["SLACK_INSTALLATION_S3_BUCKET_NAME"]
         self.s3_client = boto3.client("s3")
-        if settings.state_store is None or not isinstance(
-            settings.state_store, AmazonS3OAuthStateStore
-        ):
+        if settings.state_store is None or not isinstance(settings.state_store, AmazonS3OAuthStateStore):
             settings.state_store = AmazonS3OAuthStateStore(
                 logger=logger,
                 s3_client=self.s3_client,
                 bucket_name=oauth_state_bucket_name,
                 expiration_seconds=settings.state_expiration_seconds,
             )
 
-        if settings.installation_store is None or not isinstance(
-            settings.installation_store, AmazonS3InstallationStore
-        ):
+        if settings.installation_store is None or not isinstance(settings.installation_store, AmazonS3InstallationStore):
             settings.installation_store = AmazonS3InstallationStore(
                 logger=logger,
                 s3_client=self.s3_client,

slack_bolt/adapter/aws_lambda/lazy_listener_runner.py

@@ -20,9 +20,7 @@ def start(self, function: Callable[..., None], request: BoltRequest) -> None:
         event: dict = request.context["lambda_request"]
         headers = event["headers"]
         headers["x-slack-bolt-lazy-only"] = "1"  # not an array
-        headers[
-            "x-slack-bolt-lazy-function-name"
-        ] = request.lazy_function_name  # not an array
+        headers["x-slack-bolt-lazy-function-name"] = request.lazy_function_name  # not an array
         event["method"] = "NONE"
         invocation = self.lambda_client.invoke(
             FunctionName=request.context["aws_lambda_function_name"],

slack_bolt/adapter/aws_lambda/local_lambda_client.py

@@ -19,9 +19,7 @@ def invoke(
         Payload: str = "{}",
     ) -> InvokeResponse:
         scoped = self._config.scope(self._config.chalice_stage, FunctionName)
-        lambda_context = LambdaContext(
-            FunctionName, memory_size=scoped.lambda_memory_size
-        )
+        lambda_context = LambdaContext(FunctionName, memory_size=scoped.lambda_memory_size)
 
         with self._patched_env_vars(scoped.environment_variables):
             response = self._app(json.loads(Payload), lambda_context)