diff --git a/pyproject.toml b/pyproject.toml index c893c1c3..9fa55752 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,6 @@ disallow_subclassing_any = false disallow_untyped_calls = false disallow_untyped_decorators = false warn_return_any = false -no_implicit_reexport = false # Enable optional errors. enable_error_code = [ diff --git a/zulip_bots/zulip_bots/bots/beeminder/test_beeminder.py b/zulip_bots/zulip_bots/bots/beeminder/test_beeminder.py index 516ed1d6..da3761c4 100644 --- a/zulip_bots/zulip_bots/bots/beeminder/test_beeminder.py +++ b/zulip_bots/zulip_bots/bots/beeminder/test_beeminder.py @@ -2,7 +2,8 @@ from unittest.mock import patch from requests.exceptions import ConnectionError -from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler, get_bot_message_handler +from zulip_bots.test_file_utils import get_bot_message_handler +from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler class TestBeeminderBot(BotTestCase, DefaultTests): diff --git a/zulip_bots/zulip_bots/bots/connect_four/test_connect_four.py b/zulip_bots/zulip_bots/bots/connect_four/test_connect_four.py index 48a547b4..16491ccb 100644 --- a/zulip_bots/zulip_bots/bots/connect_four/test_connect_four.py +++ b/zulip_bots/zulip_bots/bots/connect_four/test_connect_four.py @@ -1,6 +1,6 @@ from typing import Dict, List -from zulip_bots.bots.connect_four.connect_four import ConnectFourModel +from zulip_bots.bots.connect_four.controller import ConnectFourModel from zulip_bots.game_handler import BadMoveException from zulip_bots.test_lib import BotTestCase, DefaultTests diff --git a/zulip_bots/zulip_bots/bots/dialogflow/test_dialogflow.py b/zulip_bots/zulip_bots/bots/dialogflow/test_dialogflow.py index faac3d64..2a4246e4 100644 --- a/zulip_bots/zulip_bots/bots/dialogflow/test_dialogflow.py +++ b/zulip_bots/zulip_bots/bots/dialogflow/test_dialogflow.py @@ -3,7 +3,8 @@ from contextlib import contextmanager from typing import ByteString, Iterator from unittest.mock import patch -from zulip_bots.test_lib import BotTestCase, DefaultTests, read_bot_fixture_data +from zulip_bots.test_file_utils import read_bot_fixture_data +from zulip_bots.test_lib import BotTestCase, DefaultTests class MockHttplibRequest: diff --git a/zulip_bots/zulip_bots/bots/giphy/test_giphy.py b/zulip_bots/zulip_bots/bots/giphy/test_giphy.py index fb21d40e..7afa33df 100755 --- a/zulip_bots/zulip_bots/bots/giphy/test_giphy.py +++ b/zulip_bots/zulip_bots/bots/giphy/test_giphy.py @@ -2,7 +2,8 @@ from unittest.mock import patch from requests.exceptions import ConnectionError -from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler, get_bot_message_handler +from zulip_bots.test_file_utils import get_bot_message_handler +from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler class TestGiphyBot(BotTestCase, DefaultTests): diff --git a/zulip_bots/zulip_bots/bots/github_detail/test_github_detail.py b/zulip_bots/zulip_bots/bots/github_detail/test_github_detail.py index b555d555..d9a5331e 100755 --- a/zulip_bots/zulip_bots/bots/github_detail/test_github_detail.py +++ b/zulip_bots/zulip_bots/bots/github_detail/test_github_detail.py @@ -1,4 +1,5 @@ -from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler, get_bot_message_handler +from zulip_bots.test_file_utils import get_bot_message_handler +from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler class TestGithubDetailBot(BotTestCase, DefaultTests): diff --git a/zulip_bots/zulip_bots/bots/incrementor/test_incrementor.py b/zulip_bots/zulip_bots/bots/incrementor/test_incrementor.py index f1100a04..2c255864 100644 --- a/zulip_bots/zulip_bots/bots/incrementor/test_incrementor.py +++ b/zulip_bots/zulip_bots/bots/incrementor/test_incrementor.py @@ -1,6 +1,7 @@ from unittest.mock import patch -from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler, get_bot_message_handler +from zulip_bots.test_file_utils import get_bot_message_handler +from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler class TestIncrementorBot(BotTestCase, DefaultTests): diff --git a/zulip_bots/zulip_bots/bots/salesforce/test_salesforce.py b/zulip_bots/zulip_bots/bots/salesforce/test_salesforce.py index 63e3afb7..3dc33287 100644 --- a/zulip_bots/zulip_bots/bots/salesforce/test_salesforce.py +++ b/zulip_bots/zulip_bots/bots/salesforce/test_salesforce.py @@ -4,7 +4,8 @@ from unittest.mock import patch from simple_salesforce.exceptions import SalesforceAuthenticationFailed -from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler, read_bot_fixture_data +from zulip_bots.test_file_utils import read_bot_fixture_data +from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler @contextmanager diff --git a/zulip_bots/zulip_bots/bots/trivia_quiz/test_trivia_quiz.py b/zulip_bots/zulip_bots/bots/trivia_quiz/test_trivia_quiz.py index 231f1a86..e50c0363 100644 --- a/zulip_bots/zulip_bots/bots/trivia_quiz/test_trivia_quiz.py +++ b/zulip_bots/zulip_bots/bots/trivia_quiz/test_trivia_quiz.py @@ -11,7 +11,8 @@ from zulip_bots.bots.trivia_quiz.trivia_quiz import ( update_quiz, ) from zulip_bots.request_test_lib import mock_request_exception -from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler, read_bot_fixture_data +from zulip_bots.test_file_utils import read_bot_fixture_data +from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler class TestTriviaQuizBot(BotTestCase, DefaultTests): diff --git a/zulip_bots/zulip_bots/bots/twitpost/test_twitpost.py b/zulip_bots/zulip_bots/bots/twitpost/test_twitpost.py index 89a0d68e..c62c4079 100644 --- a/zulip_bots/zulip_bots/bots/twitpost/test_twitpost.py +++ b/zulip_bots/zulip_bots/bots/twitpost/test_twitpost.py @@ -1,7 +1,7 @@ from unittest.mock import patch -from zulip_bots.test_file_utils import read_bot_fixture_data -from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler, get_bot_message_handler +from zulip_bots.test_file_utils import get_bot_message_handler, read_bot_fixture_data +from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler class TestTwitpostBot(BotTestCase, DefaultTests): diff --git a/zulip_bots/zulip_bots/bots/witai/test_witai.py b/zulip_bots/zulip_bots/bots/witai/test_witai.py index 4d7c6a65..6ec202e0 100644 --- a/zulip_bots/zulip_bots/bots/witai/test_witai.py +++ b/zulip_bots/zulip_bots/bots/witai/test_witai.py @@ -1,7 +1,8 @@ from typing import Any, Dict, Optional from unittest.mock import patch -from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler, get_bot_message_handler +from zulip_bots.test_file_utils import get_bot_message_handler +from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler class TestWitaiBot(BotTestCase, DefaultTests): diff --git a/zulip_bots/zulip_bots/bots/youtube/test_youtube.py b/zulip_bots/zulip_bots/bots/youtube/test_youtube.py index 47eb75e0..5373d7d1 100644 --- a/zulip_bots/zulip_bots/bots/youtube/test_youtube.py +++ b/zulip_bots/zulip_bots/bots/youtube/test_youtube.py @@ -3,7 +3,8 @@ from unittest.mock import patch from requests.exceptions import ConnectionError, HTTPError -from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler, get_bot_message_handler +from zulip_bots.test_file_utils import get_bot_message_handler +from zulip_bots.test_lib import BotTestCase, DefaultTests, StubBotHandler class TestYoutubeBot(BotTestCase, DefaultTests): diff --git a/zulip_bots/zulip_bots/tests/test_run.py b/zulip_bots/zulip_bots/tests/test_run.py index 966530fd..2adc5806 100644 --- a/zulip_bots/zulip_bots/tests/test_run.py +++ b/zulip_bots/zulip_bots/tests/test_run.py @@ -7,8 +7,9 @@ from typing import Optional from unittest import TestCase, mock from unittest.mock import MagicMock, patch +import importlib_metadata as metadata + import zulip_bots.run -from zulip_bots.finder import metadata from zulip_bots.lib import extract_query_without_mention diff --git a/zulip_botserver/tests/test_server.py b/zulip_botserver/tests/test_server.py index 3d94db57..e6f25570 100644 --- a/zulip_botserver/tests/test_server.py +++ b/zulip_botserver/tests/test_server.py @@ -8,7 +8,8 @@ from types import ModuleType from typing import Any, Dict from unittest import mock -from zulip_bots.finder import metadata +import importlib_metadata as metadata + from zulip_bots.lib import BotHandler from zulip_botserver import server from zulip_botserver.input_parameters import parse_args