Python3.12 Support (#19)

* Python3.12 ready * fix formatting
ckreisl · Jun 14, 2024 · 5752a23 · 5752a23 · github-actions · Jun 14, 2024
1 parent e0b1c15
commit 5752a23
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 25 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -17,11 +17,11 @@ repos:
     -   id: reorder-python-imports
         args: [--py310-plus, --add-import, 'from __future__ import annotations']
 -   repo: https://github.com/hhatto/autopep8
-    rev: v2.0.4
+    rev: v2.2.0
     hooks:
     -   id: autopep8
 -   repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
+    rev: 7.0.0
     hooks:
     -   id: flake8
         args: ['--ignore=E501']
diff --git a/cs2posts/bot/options.py b/cs2posts/bot/options.py
@@ -89,9 +89,12 @@ def create_text(chat: Chat) -> str:
 
         return (f"<b>Options</b>\n\n"
                 "Handle the automatically send Counter-Strike post notifications.\n\n"
-                f"{icon_is_update_interested} - Send Update Posts ({text_enabled_update})\n"
-                f"{icon_is_news_interested} - Send News Posts ({text_enabled_news})\n"
-                f"{icon_is_external_news_interested} - Send External News Posts ({text_enabled_external_news})\n\n"
+                f"{icon_is_update_interested} - Send Update Posts ("
+                f"{text_enabled_update})\n"
+                f"{icon_is_news_interested} - Send News Posts ("
+                f"{text_enabled_news})\n"
+                f"{icon_is_external_news_interested} - Send External News Posts ("
+                f"{text_enabled_external_news})\n\n"
                 f"Select an option to change, or press 'Close' to keep everything as it is.")
 
 

diff --git a/cs2posts/bot/spam.py b/cs2posts/bot/spam.py
@@ -22,7 +22,7 @@ def warning(chat: Chat, max_strikes: int) -> str:
 
     @staticmethod
     def banned(chat: Chat, timout: int, max_strikes: int) -> str:
-        return f"<b>Strike ({chat.strikes}/{max_strikes})</b> Chat is now <b>banned</b> for spamming (Timeout: {int(timout/60)} mins)."
+        return f"<b>Strike ({chat.strikes}/{max_strikes})</b> Chat is now <b>banned</b> for spamming (Timeout: {int(timout / 60)} mins)."
 
 
 class SpamProtector:

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -9,3 +9,4 @@ pytest-asyncio==0.23.6
 pytest-mock==3.14.0
 pytest-cov==5.0.0
 flake8==7.0.0
+pre-commit
diff --git a/tests/bot/test_cs2bot.py b/tests/bot/test_cs2bot.py
@@ -64,14 +64,14 @@ def bot(mocked_crawler, mocked_post_store, mocked_chat_store, mocked_spam_protec
 
 def test_cs2_bot_init_no_files(bot):
     bot.local_chat_store.is_empty.return_value = True
-    bot.local_chat_store.is_empty.called_once()
-    bot.local_chat_store.save.called_once()
+    bot.local_chat_store.is_empty.assert_called()
+    bot.local_chat_store.save.assert_called()
 
     bot.local_post_store.is_empty.return_value = True
-    bot.local_post_store.is_empty.called_once()
-    bot.crawler.crawl.called_once()
-    bot.local_post_store.save.called_once()
-    bot.local_chat_store.save.called_once()
+    bot.local_post_store.is_empty.assert_called()
+    bot.crawler.crawl.assert_called()
+    bot.local_post_store.save.assert_called()
+    bot.local_chat_store.save.assert_called()
 
     # TODO finish up setup
 
@@ -163,8 +163,8 @@ async def test_cs2_bot_left_chat_member_bot_left(bot):
     bot.local_chat_store.reset_mock()
     await bot.left_chat_member(mocked_update, mocked_context)
 
-    bot.chats.remove.called_once_with(chat)
-    bot.local_chat_store.save.called_once()
+    bot.chats.remove.assert_called_once_with(chat)
+    bot.local_chat_store.save.assert_called_once()
 
 
 @pytest.mark.asyncio

diff --git a/tests/bot/test_message.py b/tests/bot/test_message.py
@@ -111,5 +111,5 @@ async def test_telegram_message_send_update(mocked_cs2_update_post):
 
     await msg.send(bot=mocked_bot, chat_id=1337)
 
-    assert mocked_bot.send_photo.not_called
-    assert mocked_bot.send_message.called
+    mocked_bot.send_photo.assert_not_called()
+    mocked_bot.send_message.assert_called()
diff --git a/tests/bot/test_spam.py b/tests/bot/test_spam.py
@@ -6,6 +6,7 @@
 from zoneinfo import ZoneInfo
 
 import pytest
+from telegram.constants import ParseMode
 
 from cs2posts.bot import settings
 from cs2posts.bot.chats import Chat
@@ -139,19 +140,25 @@ async def test_spam_protector_strike(spam_protector, chat):
     chat.is_banned = False
     await spam_protector.strike(mock_bot, chat)
     assert chat.strikes == 1
-    assert await mock_bot.send_message.called_once_with(
-        chat.chat_id,
-        SpamProtectorMessages.warning(chat, settings.CHAT_MAX_STRIKES))
+    mock_bot.send_message.assert_called_once_with(
+        chat_id=chat.chat_id,
+        text=SpamProtectorMessages.warning(chat, settings.CHAT_MAX_STRIKES),
+        parse_mode=ParseMode.HTML)
+    mock_bot.reset_mock()
 
     await spam_protector.strike(mock_bot, chat)
     assert chat.strikes == 2
-    assert await mock_bot.send_message.called_once_with(
-        chat.chat_id,
-        SpamProtectorMessages.warning(chat, settings.CHAT_MAX_STRIKES))
+    mock_bot.send_message.assert_called_once_with(
+        chat_id=chat.chat_id,
+        text=SpamProtectorMessages.warning(chat, settings.CHAT_MAX_STRIKES),
+        parse_mode=ParseMode.HTML)
+    mock_bot.reset_mock()
 
     await spam_protector.strike(mock_bot, chat)
     assert chat.strikes == 3
-    assert await mock_bot.send_message.called_once_with(
-        chat.chat_id,
-        SpamProtectorMessages.banned(chat, settings.CHAT_BAN_TIMEOUT_SECONDS, settings.CHAT_MAX_STRIKES))
+    mock_bot.send_message.assert_called_once_with(
+        chat_id=chat.chat_id,
+        text=SpamProtectorMessages.banned(
+            chat, settings.CHAT_BAN_TIMEOUT_SECONDS, settings.CHAT_MAX_STRIKES),
+        parse_mode=ParseMode.HTML)
     assert chat.is_banned
File	Stmts	Miss	Cover	Missing
__init__.py	0	0	100%
crawler.py	30	0	100%
cs2.py	82	8	90%	30, 37, 42, 48, 103, 116–118
post.py	58	4	93%	61–63, 66
store.py	98	24	75%	21, 25, 29, 33, 42, 49–50, 57–58, 62, 68–69, 76, 87–88, 90, 104, 107–110, 117, 123, 132
bot
__init__.py	0	0	100%
chats.py	72	5	93%	80–83, 101
constants.py	4	0	100%
content.py	76	6	92%	28, 49, 62, 90, 100, 106
cs2.py	282	69	75%	37–42, 44–46, 170, 173, 175, 178–183, 185–188, 293–296, 299–300, 302–303, 305, 307, 310–311, 314–315, 317–318, 320, 322, 325–326, 329–330, 332, 334–335, 337, 339, 342–343, 353, 355–357, 359–361, 363–365, 367, 379, 411, 413–416, 422
decorators.py	3	3	0%	1, 3, 5
message.py	158	57	63%	62, 85, 96, 109, 111, 121, 123–124, 126, 128–130, 139–142, 144, 156–159, 193–194, 196, 198–199, 201–202, 204, 206–211, 213–215, 217–220, 222–227, 229–230, 232, 234, 237–238, 253–255
options.py	105	20	80%	35, 42–44, 49–51, 53, 70, 74–75, 79, 81, 83, 86–88, 90, 168–169
settings.py	13	0	100%
spam.py	71	0	100%
utils.py	24	7	70%	17, 21–23, 31–33
parser
__init__.py	0	0	100%
parser.py	14	1	92%	21
steam2telegram_html.py	26	0	100%
steam_list.py	52	0	100%
steam_news_image.py	16	0	100%
steam_news_youtube.py	12	0	100%
steam_update_heading.py	21	0	100%
TOTAL	1217	204	83%