phases 5-6

Irving Popovetsky · Irving Popovetsky · commit 18fe03b4c147 · 2026-01-04T19:44:30.000-08:00
diff --git a/docs/UPGRADE_PLAN.md b/docs/UPGRADE_PLAN.md
@@ -995,7 +995,10 @@ __all__ = ["sirbot", "slack"]
 
 ---
 
-## Phase 5: Update pybot Imports (Day 4-5)
+## Phase 5: Update pybot Imports (Day 4-5) ✅ COMPLETE
+
+> **Status**: Completed January 4, 2026
+> **Result**: All 19 files updated to use vendored imports - all imports verified working
 
 ### 5.1 Update All Import Statements
 
@@ -1116,7 +1119,10 @@ def slack_bot(bot: SirBot) -> SirBot:
 
 ---
 
-## Phase 6: Update pyproject.toml (Day 5)
+## Phase 6: Update pyproject.toml (Day 5) ✅ COMPLETE
+
+> **Status**: Completed January 4, 2026
+> **Result**: Updated to Python 3.12+, removed vendored deps, modernized all dependencies
 
 ### 6.1 New pyproject.toml
 
@@ -1130,7 +1136,7 @@ license = "MIT"
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = "^3.11"
+python = "^3.12"
 aiohttp = "^3.9"
 python-dotenv = "^1.0"
 pyyaml = "^6.0"
diff --git a/poetry.lock b/poetry.lock
diff --git a/pybot/__main__.py b/pybot/__main__.py
@@ -4,8 +4,8 @@
 import sentry_sdk
 import yaml
 from sentry_sdk.integrations.aiohttp import AioHttpIntegration
-from sirbot import SirBot
-from sirbot.plugins.slack import SlackPlugin
+from pybot._vendor.sirbot import SirBot
+from pybot._vendor.sirbot.plugins.slack import SlackPlugin
 
 from pybot.endpoints import handle_health_check
 from pybot.endpoints.slack.utils import HOST, PORT, slack_configs
diff --git a/pybot/endpoints/airtable/requests.py b/pybot/endpoints/airtable/requests.py
@@ -1,7 +1,7 @@
 import asyncio
 import logging
 
-from sirbot import SirBot
+from pybot._vendor.sirbot import SirBot
 
 from pybot.endpoints.airtable.utils import (
     _create_messages,
diff --git a/pybot/endpoints/airtable/utils.py b/pybot/endpoints/airtable/utils.py
@@ -1,10 +1,10 @@
 from typing import List, Optional, Tuple
 
-from sirbot import SirBot
-from slack import ROOT_URL, methods
-from slack.events import Message
-from slack.exceptions import SlackAPIError
-from slack.io.aiohttp import SlackAPI
+from pybot._vendor.sirbot import SirBot
+from pybot._vendor.slack import ROOT_URL, methods
+from pybot._vendor.slack.events import Message
+from pybot._vendor.slack.exceptions import SlackAPIError
+from pybot._vendor.slack.io.aiohttp import SlackAPI
 
 from pybot.endpoints.slack.utils import MENTOR_CHANNEL
 from pybot.plugins.airtable.api import AirtableAPI
diff --git a/pybot/endpoints/api/slack_api.py b/pybot/endpoints/api/slack_api.py
@@ -1,8 +1,8 @@
 import logging
 
-from sirbot import SirBot
-from slack import ROOT_URL
-from slack.exceptions import SlackAPIError
+from pybot._vendor.sirbot import SirBot
+from pybot._vendor.slack import ROOT_URL
+from pybot._vendor.slack.exceptions import SlackAPIError
 
 from pybot.endpoints.api.utils import (
     _slack_info_from_email,
diff --git a/pybot/endpoints/api/utils.py b/pybot/endpoints/api/utils.py
@@ -1,10 +1,10 @@
 import logging
 from typing import Optional
 
-from slack import ROOT_URL
-from slack.exceptions import SlackAPIError
-from slack.io.abc import SlackAPI
-from slack.methods import Methods
+from pybot._vendor.slack import ROOT_URL
+from pybot._vendor.slack.exceptions import SlackAPIError
+from pybot._vendor.slack.io.abc import SlackAPI
+from pybot._vendor.slack.methods import Methods
 
 from pybot.endpoints.slack.utils import OPS_CHANNEL, PYBOT_ENV
 from pybot.endpoints.slack.utils.action_messages import (
diff --git a/pybot/endpoints/slack/actions/__init__.py b/pybot/endpoints/slack/actions/__init__.py
@@ -1,4 +1,4 @@
-from sirbot.plugins.slack import SlackPlugin
+from pybot._vendor.sirbot.plugins.slack import SlackPlugin
 
 from .general_actions import claimed, delete_message, reset_claim
 from .mentor_request import (
diff --git a/pybot/endpoints/slack/actions/general_actions.py b/pybot/endpoints/slack/actions/general_actions.py
@@ -1,6 +1,6 @@
-from sirbot import SirBot
-from slack import methods
-from slack.actions import Action
+from pybot._vendor.sirbot import SirBot
+from pybot._vendor.slack import methods
+from pybot._vendor.slack.actions import Action
 
 from pybot.endpoints.slack.utils.action_messages import (
     base_response,
diff --git a/pybot/endpoints/slack/actions/mentor_request.py b/pybot/endpoints/slack/actions/mentor_request.py
@@ -1,9 +1,9 @@
 import json
 import logging
 
-from sirbot import SirBot
-from slack import methods
-from slack.actions import Action
+from pybot._vendor.sirbot import SirBot
+from pybot._vendor.slack import methods
+from pybot._vendor.slack.actions import Action
 
 from pybot.endpoints.slack.message_templates.mentor_request import (
     MentorRequest,
diff --git a/pybot/endpoints/slack/actions/mentor_volunteer.py b/pybot/endpoints/slack/actions/mentor_volunteer.py
@@ -1,9 +1,9 @@
 import logging
 
-from sirbot import SirBot
-from slack import methods
-from slack.actions import Action
-from slack.exceptions import SlackAPIError
+from pybot._vendor.sirbot import SirBot
+from pybot._vendor.slack import methods
+from pybot._vendor.slack.actions import Action
+from pybot._vendor.slack.exceptions import SlackAPIError
 
 from pybot.endpoints.slack.message_templates.mentor_volunteer import MentorVolunteer
 from pybot.endpoints.slack.utils import MENTOR_CHANNEL
diff --git a/pybot/endpoints/slack/actions/new_member.py b/pybot/endpoints/slack/actions/new_member.py
@@ -1,6 +1,6 @@
-from sirbot import SirBot
-from slack import methods
-from slack.actions import Action
+from pybot._vendor.sirbot import SirBot
+from pybot._vendor.slack import methods
+from pybot._vendor.slack.actions import Action
 
 from pybot.endpoints.slack.utils import COMMUNITY_CHANNEL
 from pybot.endpoints.slack.utils.action_messages import (
diff --git a/pybot/endpoints/slack/actions/report_message.py b/pybot/endpoints/slack/actions/report_message.py
@@ -1,8 +1,8 @@
 import json
 
-from sirbot import SirBot
-from slack import methods
-from slack.actions import Action
+from pybot._vendor.sirbot import SirBot
+from pybot._vendor.slack import methods
+from pybot._vendor.slack.actions import Action
 
 from pybot.endpoints.slack.utils.action_messages import (
     build_report_message,
diff --git a/pybot/endpoints/slack/commands.py b/pybot/endpoints/slack/commands.py
@@ -1,10 +1,10 @@
 import logging
 import random
 
-from sirbot import SirBot
-from sirbot.plugins.slack import SlackPlugin
-from slack import methods
-from slack.commands import Command
+from pybot._vendor.sirbot import SirBot
+from pybot._vendor.sirbot.plugins.slack import SlackPlugin
+from pybot._vendor.slack import methods
+from pybot._vendor.slack.commands import Command
 
 from pybot.endpoints.slack.message_templates.commands import (
     mentor_request_blocks,
diff --git a/pybot/endpoints/slack/events.py b/pybot/endpoints/slack/events.py
@@ -1,8 +1,8 @@
 import asyncio
 import logging
 
-from sirbot import SirBot
-from slack.events import Event
+from pybot._vendor.sirbot import SirBot
+from pybot._vendor.slack.events import Event
 
 from pybot.endpoints.slack.utils.event_utils import (
     build_messages,
diff --git a/pybot/endpoints/slack/message_templates/block_action.py b/pybot/endpoints/slack/message_templates/block_action.py
@@ -3,9 +3,9 @@
 from enum import IntEnum
 from typing import Any, Coroutine, MutableMapping, Optional
 
-from slack import methods
-from slack.actions import Action
-from slack.io.abc import SlackAPI
+from pybot._vendor.slack import methods
+from pybot._vendor.slack.actions import Action
+from pybot._vendor.slack.io.abc import SlackAPI
 
 
 class BlockAction(Action):
diff --git a/pybot/endpoints/slack/message_templates/mentor_request.py b/pybot/endpoints/slack/message_templates/mentor_request.py
@@ -1,9 +1,9 @@
 from enum import IntEnum
 from typing import Any, Coroutine, MutableMapping, Optional
 
-from slack import methods
-from slack.actions import Action
-from slack.io.abc import SlackAPI
+from pybot._vendor.slack import methods
+from pybot._vendor.slack.actions import Action
+from pybot._vendor.slack.io.abc import SlackAPI
 
 from pybot.endpoints.slack.utils.action_messages import now
 from pybot.plugins.airtable.api import AirtableAPI
diff --git a/pybot/endpoints/slack/messages.py b/pybot/endpoints/slack/messages.py
@@ -1,8 +1,8 @@
 import logging
 
-from sirbot import SirBot
-from slack import methods
-from slack.events import Message
+from pybot._vendor.sirbot import SirBot
+from pybot._vendor.slack import methods
+from pybot._vendor.slack.events import Message
 
 from .message_templates.tech import TechTerms
 from .utils import BOT_URL
diff --git a/pybot/endpoints/slack/utils/command_utils.py b/pybot/endpoints/slack/utils/command_utils.py
@@ -1,4 +1,4 @@
-from slack import methods
+from pybot._vendor.slack import methods
 
 from pybot.endpoints.slack.utils.slash_repeat import repeat_items
 
diff --git a/pybot/endpoints/slack/utils/event_utils.py b/pybot/endpoints/slack/utils/event_utils.py
@@ -2,9 +2,9 @@
 from typing import Dict, List, Tuple
 
 from aiohttp import ClientSession
-from slack import methods
-from slack.events import Message
-from slack.io.abc import SlackAPI
+from pybot._vendor.slack import methods
+from pybot._vendor.slack.events import Message
+from pybot._vendor.slack.io.abc import SlackAPI
 
 from pybot.endpoints.slack.utils import (
     BACKEND_PASS,
diff --git a/pybot/endpoints/slack/utils/general_utils.py b/pybot/endpoints/slack/utils/general_utils.py
@@ -1,9 +1,9 @@
 import functools
 
-from sirbot import SirBot
-from slack.commands import Command
-from slack.exceptions import SlackAPIError
-from slack.methods import Methods
+from pybot._vendor.sirbot import SirBot
+from pybot._vendor.slack.commands import Command
+from pybot._vendor.slack.exceptions import SlackAPIError
+from pybot._vendor.slack.methods import Methods
 
 
 def catch_command_slack_error(func):
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,32 +1,43 @@
 [tool.poetry]
 name = "operationcode-pybot"
-version = "2.1"
+version = "3.0.0"
 description = "Operation Code's Official Slackbot"
-authors = ["Allen Anthes <allen@operationcode.org>"]
+authors = ["Operation Code <contact@operationcode.org>"]
 license = "MIT"
+readme = "README.md"
+packages = [{include = "pybot"}]
 
 [tool.poetry.dependencies]
-python = "^3.7"
-aiocontextvars = "^0.2.2"
-cchardet = "^2.1.6"
-cython = "^0.29.21"
-python-dotenv = "^0.14.0"
-pyyaml = "^5.3.1"
-sentry-sdk = "^0.17.8"
-sirbot = "^0.1.1"
-zipcodes = "^1.1.2"
+python = "^3.12"
+aiohttp = "^3.9"
+python-dotenv = "^1.0"
+pyyaml = "^6.0"
+sentry-sdk = "^2.0"
+zipcodes = "^1.2"
 
-[tool.poetry.dev-dependencies]
-asynctest = "^0.13.0"
-black = {version = "^20.8b1", allow-prereleases = true}
-flake8 = "^3.8.3"
-isort = "^4.3"
-pytest = "^6.0.2"
-pytest-aiohttp = "^0.3.0"
-pytest-asyncio = "^0.14.0"
-pytest-mock = "^3.3.1"
-requests = "^2.22"
+[tool.poetry.group.dev.dependencies]
+pytest = "^9.0"
+pytest-asyncio = "^1.0"
+pytest-aiohttp = "^1.0"
+pytest-mock = "^3.12"
+black = "^25.0"
+ruff = "^0.14"
+requests = "^2.31"
 
 [build-system]
-requires = ["poetry>=0.12"]
-build-backend = "poetry.masonry.api"
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+testpaths = ["tests"]
+
+[tool.ruff]
+select = ["E", "F", "I", "UP"]
+ignore = []
+line-length = 100
+target-version = "py312"
+
+[tool.black]
+line-length = 100
+target-version = ["py312"]
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,14 +1,14 @@
 import copy
 
 import pytest
-from sirbot import SirBot
-from sirbot.plugins.slack import SlackPlugin
+from pybot._vendor.sirbot import SirBot
+from pybot._vendor.sirbot.plugins.slack import SlackPlugin
 
 from pybot import endpoints
 from pybot.plugins import AirtablePlugin, APIPlugin
 from tests import data
 
-pytest_plugins = ("slack.tests.plugin",)
+pytest_plugins = ("pybot._vendor.slack.tests.plugin",)
 
 
 @pytest.fixture(params={**data.Action.__members__})
diff --git a/tests/endpoints/api/test_slack_api_endpoint.py b/tests/endpoints/api/test_slack_api_endpoint.py
@@ -2,7 +2,7 @@
 
 import pytest
 from asynctest import CoroutineMock
-from sirbot import SirBot
+from pybot._vendor.sirbot import SirBot
 
 MOCK_USER_NAME = "userName"
 MOCK_USER_ID = "U8N6XBL7Q"
diff --git a/tests/endpoints/slack/test_slack_actions.py b/tests/endpoints/slack/test_slack_actions.py
@@ -1,5 +1,5 @@
 from asynctest import CoroutineMock
-from sirbot import SirBot
+from pybot._vendor.sirbot import SirBot
 
 
 async def test_claim_mentee_response_attachment_is_list(

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from sirbot.plugins.slack import SlackPlugin`
	`1`	`+from pybot._vendor.sirbot.plugins.slack import SlackPlugin`
`2`	`2`
`3`	`3`	`from .general_actions import claimed, delete_message, reset_claim`
`4`	`4`	`from .mentor_request import (`