refactor imports (#70)

.pre-commit-config.yaml

@@ -13,6 +13,11 @@ repos:
     -   id: debug-statements
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
+-   repo: https://github.com/asottile/reorder_python_imports
+    rev: v3.9.0
+    hooks:
+    -   id: reorder-python-imports
+        args: [--py38-plus]
 -   repo: https://github.com/psf/black
     rev: 23.1.0
     hooks:

manage.py

@@ -1,6 +1,4 @@
 #!/usr/bin/env python
-
-from __future__ import absolute_import
 import gevent.monkey
 
 gevent.monkey.patch_all()

omnibot/__init__.py

@@ -1,4 +1,4 @@
-from os import getenv
 import importlib
+from os import getenv
 
 logging = importlib.import_module(getenv("LOG_MODULE", "logging"))

omnibot/app.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from flask import Flask
 
 from omnibot import settings

omnibot/authnz/__init__.py

@@ -14,7 +14,8 @@
 import re
 from functools import wraps
 
-from flask import abort, request
+from flask import abort
+from flask import request
 
 from omnibot import logging
 from omnibot import settings

omnibot/callbacks/interactive_component_callbacks.py

@@ -1,7 +1,6 @@
 """
 Interactive component callbacks for internal omnibot functionality.
 """
-
 import json
 
 from omnibot import logging

omnibot/callbacks/message_callbacks.py

@@ -1,13 +1,12 @@
 """
 Message callbacks for internal omnibot functionality.
 """
-
 import json
 import random
 
 from omnibot import logging
-from omnibot.services.slack.team import Team
 from omnibot.services.slack.bot import Bot
+from omnibot.services.slack.team import Team
 
 logger = logging.getLogger(__name__)
 

omnibot/callbacks/slash_command_callbacks.py

@@ -1,7 +1,6 @@
 """
 Slash command callbacks for internal omnibot functionality.
 """
-
 import json
 
 from omnibot import logging

omnibot/processor.py

@@ -1,23 +1,25 @@
 """
 Core processing logic.
 """
-import re
-import json
 import importlib
+import json
+import re
 
 import requests
 
 from omnibot import logging
 from omnibot import settings
 from omnibot.services import slack
-from omnibot.services.slack.message import Message, MessageUnsupportedError
-from omnibot.services.slack.slash_command import SlashCommand
-from omnibot.services.slack.interactive_component import InteractiveComponent
 from omnibot.services import stats
 from omnibot.services.slack import parser
-from omnibot.services.slack.team import Team
 from omnibot.services.slack.bot import Bot
-from omnibot.utils import get_callback_id, merge_logging_context
+from omnibot.services.slack.interactive_component import InteractiveComponent
+from omnibot.services.slack.message import Message
+from omnibot.services.slack.message import MessageUnsupportedError
+from omnibot.services.slack.slash_command import SlashCommand
+from omnibot.services.slack.team import Team
+from omnibot.utils import get_callback_id
+from omnibot.utils import merge_logging_context
 
 logger = logging.getLogger(__name__)
 

omnibot/routes/api.py

@@ -7,26 +7,29 @@
 
 * :func:`omnibot.authnz:enforce_checks`
 """
-from __future__ import absolute_import
 import json
 import time
 from functools import wraps
 
-from flask import Blueprint, jsonify, request, abort
+from flask import abort
+from flask import Blueprint
+from flask import jsonify
+from flask import request
 
 from omnibot import authnz
 from omnibot import logging
+from omnibot.processor import _handle_interactive_component_callback
 from omnibot.processor import parse_kwargs
+from omnibot.services import slack
 from omnibot.services import sqs
 from omnibot.services import stats
-from omnibot.services import slack
+from omnibot.services.slack.bot import Bot
+from omnibot.services.slack.bot import BotInitializationError
 from omnibot.services.slack.interactive_component import InteractiveComponent
 from omnibot.services.slack.team import Team
 from omnibot.services.slack.team import TeamInitializationError
-from omnibot.services.slack.bot import Bot
-from omnibot.services.slack.bot import BotInitializationError
-from omnibot.utils import get_callback_id, merge_logging_context
-from omnibot.processor import _handle_interactive_component_callback
+from omnibot.utils import get_callback_id
+from omnibot.utils import merge_logging_context
 
 logger = logging.getLogger(__name__)
 

omnibot/services/omniredis.py

@@ -1,6 +1,7 @@
-import redis
 import functools
 
+import redis
+
 from omnibot import settings
 
 

omnibot/services/slack/message.py

@@ -1,6 +1,6 @@
 from omnibot import logging
-from omnibot.services import stats
 from omnibot.services import slack
+from omnibot.services import stats
 from omnibot.services.slack import parser
 
 logger = logging.getLogger(__name__)

omnibot/settings.py

@@ -1,9 +1,9 @@
-from __future__ import absolute_import
-
 import yaml
 
 from omnibot import logging
-from omnibot.utils.settings import bool_env, int_env, str_env
+from omnibot.utils.settings import bool_env
+from omnibot.utils.settings import int_env
+from omnibot.utils.settings import str_env
 
 logger = logging.getLogger(__name__)
 

omnibot/setup_logging.py

@@ -1,6 +1,5 @@
-import os.path
-import logging
 import logging.config
+import os.path
 
 import yaml
 

omnibot/watcher.py

@@ -1,4 +1,4 @@
-import gevent
+import gevent  # noreorder
 import gevent.monkey
 
 gevent.monkey.patch_all()

omnibot/webhook_worker.py

@@ -1,4 +1,4 @@
-import gevent
+import gevent  # noreorder
 import gevent.monkey
 
 gevent.monkey.patch_all(thread=False)

omnibot/wsgi.py

@@ -1,8 +1,5 @@
-from __future__ import absolute_import
-
-from omnibot.app import app
 from omnibot import settings
-
+from omnibot.app import app
 from omnibot.routes import api
 
 app.register_blueprint(api.blueprint)

setup.py

@@ -1,4 +1,5 @@
-from setuptools import setup, find_packages
+from setuptools import find_packages
+from setuptools import setup
 
 with open("requirements.in") as f:
     REQUIREMENTS = f.read().splitlines()

tests/__init__.py

@@ -1,11 +1,11 @@
 # Make the tests directory a python module
 # so that all unit tests are reported as part of the tests package.
-
 import os
 
-# Inject mandatory environment variables
 from tests.data import TEST_CONFIG
 
+# Inject mandatory environment variables
+
 env_settings = [
     ("CREDENTIALS_SLACK_VERIFICATION_TOKEN_A12345678", "1234"),
     ("CREDENTIALS_SLACK_OAUTH_TOKEN_A12345678", "1234"),

tests/integration/routes/test_interactive.py

@@ -1,5 +1,6 @@
 import json
-from typing import Any, Dict  # noqa: F401
+from typing import Any
+from typing import Dict
 from unittest.mock import MagicMock
 
 from flask import Response  # noqa: F401

tests/integration/routes/test_slack_event.py

@@ -1,5 +1,6 @@
 import json
-from typing import Dict, Any  # noqa: F401
+from typing import Any
+from typing import Dict
 from unittest.mock import MagicMock
 
 from flask import Response  # noqa: F401

tests/integration/routes/test_slash_command.py

@@ -1,5 +1,6 @@
 import json
-from typing import Dict, Any  # noqa: F401
+from typing import Any
+from typing import Dict
 from unittest.mock import MagicMock
 
 from flask import Response  # noqa: F401

tests/unit/omnibot/authnz/authnz_test.py

@@ -1,8 +1,8 @@
 import pytest
 from werkzeug.exceptions import HTTPException
 
-from omnibot.app import app
 from omnibot import authnz
+from omnibot.app import app
 
 
 def test_enforce_checks(mocker):

tests/unit/omnibot/services/slack/bot_test.py

@@ -1,7 +1,8 @@
 import pytest
 
+from omnibot.services.slack.bot import Bot
+from omnibot.services.slack.bot import BotInitializationError
 from omnibot.services.slack.team import Team
-from omnibot.services.slack.bot import Bot, BotInitializationError
 
 
 def test_team():

tests/unit/omnibot/services/slack/interactive_component_test.py

@@ -1,6 +1,6 @@
-from omnibot.services.slack.team import Team
 from omnibot.services.slack.bot import Bot
 from omnibot.services.slack.interactive_component import InteractiveComponent
+from omnibot.services.slack.team import Team
 
 
 def test_interactive_component(mocker):

tests/unit/omnibot/services/slack/message_test.py

@@ -2,9 +2,10 @@
 
 import pytest
 
-from omnibot.services.slack.team import Team
 from omnibot.services.slack.bot import Bot
-from omnibot.services.slack.message import Message, MessageUnsupportedError
+from omnibot.services.slack.message import Message
+from omnibot.services.slack.message import MessageUnsupportedError
+from omnibot.services.slack.team import Team
 
 
 def test_message(mocker):

tests/unit/omnibot/services/slack/parser_test.py

@@ -1,4 +1,5 @@
-from omnibot.services.slack.parser import extract_users, extract_mentions
+from omnibot.services.slack.parser import extract_mentions
+from omnibot.services.slack.parser import extract_users
 
 
 def test_extract_user():

tests/unit/omnibot/services/slack/team_test.py

@@ -1,6 +1,7 @@
 import pytest
 
-from omnibot.services.slack.team import Team, TeamInitializationError
+from omnibot.services.slack.team import Team
+from omnibot.services.slack.team import TeamInitializationError
 
 
 def test_team():