Merge branch 'master' into doc_requirements

Author: andresdelfino

.github/workflows/docs.yml

@@ -6,8 +6,10 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -16,7 +18,7 @@ jobs:
         run: |
           sphinx-build -b html docs/source docs/build/html
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         # if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/testing' }}
         with:

.github/workflows/pythonapp.yml

@@ -18,23 +18,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.8
+        python-version: '3.10'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install .
+        pip install '.[dev]'
     - name: Lint with flake8
       run: |
-        pip install flake8
         # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Test with pytest
       run: |
-        pip install pytest
         pytest

.readthedocs.yaml

@@ -3,7 +3,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.9"
+    python: "3.10"
 
 python:
   install:

README.md

@@ -25,17 +25,13 @@ Despues instala el paquete en modo desarrollo en un virtualenv
 ~~~bash
 virtualenv -p python3 venv
 source venv/bin/activate
-pip install -e .
+pip install -e '.[dev]'
 ~~~
 
 y estas listo para trabajar.
 
 `pip install freezegun` para correr los tests.
 
-### Python 3.12
-
-`pip install setuptools`
-
 ## Testeo
 
 Para correr el bot ejecutá (desde el virtualenv):

bin/run_bot.py

@@ -13,11 +13,11 @@
 from pycamp_bot.commands import schedule
 from pycamp_bot.commands import announcements
 from pycamp_bot.commands import devtools
+from pycamp_bot.constants import SENTRY_DATA_SOURCE_NAME_ENVVAR
 from pycamp_bot.models import models_db_connection
 from pycamp_bot.logger import logger
 
 
-SENTRY_DATA_SOURCE_NAME_ENVVAR = 'SENTRY_DATA_SOURCE_NAME'
 if SENTRY_DATA_SOURCE_NAME_ENVVAR in os.environ:
     sentry_sdk.init(dsn=os.environ[SENTRY_DATA_SOURCE_NAME_ENVVAR])
 

docs/source/conf.py

@@ -35,7 +35,7 @@
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
 
 html_theme = 'sphinx_rtd_theme'
-html_static_path = ['_static']
+# html_static_path = ['_static']
 # html_favicon = '_static/img/icon.svg'
 # html_logo = '_static/img/logo.png'
 

docs/source/pycamp_bot/db_schemma.rst docs/source/pycamp_bot/db_schema.rstdocs/source/pycamp_bot/db_schemma.rst renamed to docs/source/pycamp_bot/db_schema.rst

@@ -9,7 +9,7 @@ dependencies = [
   "munch==4.0.0",
   "python-telegram-bot==21.3",
   "peewee==3.17.5",
-  "sentry-sdk==2.6.0",
+  "sentry-sdk==2.8.0",
 ]
 requires-python = "==3.10.*"
 authors = [
@@ -19,6 +19,11 @@ description = "Bot de telegram para organizar pycamp"
 readme = "README.md"
 
 [project.optional-dependencies]
+dev = [
+  "flake8==7.1.0",
+  "freezegun==1.5.1",
+  "pytest==8.2.2",
+]
 doc = [
   "sphinx==7.3.7",
   "sphinx_rtd_theme==2.0.0",

pyproject.toml

@@ -2,6 +2,7 @@
 from telegram.ext import CommandHandler
 from pycamp_bot.models import Pycampista
 from pycamp_bot.logger import logger
+from pycamp_bot.utils import escape_markdown
 
 
 def get_admins_username():
@@ -84,8 +85,11 @@ async def revoke_admin(update, context):
     user = Pycampista.select().where(Pycampista.username == fallen_admin)[0]
     user.admin = False
     user.save()
-    await context.bot.send_message(chat_id=chat_id,
-                     text='Un admin ha caido --{}--.'.format(fallen_admin))
+    await context.bot.send_message(
+        chat_id=chat_id,
+        text=f'Un admin ha caído ~{escape_markdown(fallen_admin)}~\\.',
+        parse_mode='MarkdownV2',
+    )
 
 
 async def list_admins(update, context):

src/pycamp_bot/commands/auth.py

@@ -32,7 +32,7 @@ async def start(update, context):
 
 async def help(update, context):
     logger.info('Returning help message')
-    await context.bot.send_message(chat_id=update.message.chat_id, text=get_help(update, context), parse_mode='Markdown')
+    await context.bot.send_message(chat_id=update.message.chat_id, text=get_help(update, context), parse_mode='MarkdownV2')
 
 
 # async def error(update, context):