Merge master

PyAr · Oct 5, 2024 · 9a73729 · 9a73729
2 parents c432cd0 + f105813
commit 9a73729
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -6,8 +6,8 @@ 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
@@ -17,7 +17,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:

diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml
@@ -18,11 +18,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python 3.10
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: 3.10
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

diff --git a/bin/run_bot.py b/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])
 

diff --git a/docs/source/pycamp_bot/db_schemma.rst → docs/source/pycamp_bot/db_schema.rst b/docs/source/pycamp_bot/db_schemma.rst → docs/source/pycamp_bot/db_schema.rst
diff --git a/src/pycamp_bot/commands/devtools.py b/src/pycamp_bot/commands/devtools.py
@@ -1,8 +1,10 @@
+import os
 import subprocess
 import sys
 
 from telegram.ext import CommandHandler
 
+from pycamp_bot.constants import SENTRY_DATA_SOURCE_NAME_ENVVAR
 from pycamp_bot.utils import escape_markdown
 
 
@@ -28,6 +30,11 @@ async def show_version(update, context):
     for pip_line in pip_freeze.stdout.decode().splitlines():
         dependencies.append(escape_markdown(pip_line))
 
+    if SENTRY_DATA_SOURCE_NAME_ENVVAR in os.environ:
+        sentry_envvar_set = '🟢'
+    else:
+        sentry_envvar_set = '🔴'
+
     lines = [
         f'Commit deployado: `{commit}`',
         f'Fecha del commit \\(author date\\): `{escape_markdown(author_date)}`',
@@ -37,6 +44,7 @@ async def show_version(update, context):
         '```',
         *dependencies,
         '```',
+        f'Variable de entorno de Sentry definida: {sentry_envvar_set}',
     ]
 
     await update.message.reply_text('\n'.join(lines), parse_mode='MarkdownV2')

diff --git a/src/pycamp_bot/commands/help_msg.py b/src/pycamp_bot/commands/help_msg.py
@@ -16,7 +16,7 @@
 /anunciar: te pide el nombre de un proyecto y pingea por privado a les \
     interesades avisando que esta por empezar (solo para admins u owners del proyecto).
 /su (passwrd): convierte al usuario en admin. Si sabe el password :P
-/mostrar_version: te muestra qué versión del bot está corriendo y otros detalles
+/mostrar\\_version: te muestra qué versión del bot está corriendo y otros detalles
 /admins: lista a todos los admins.
 /ayuda: esta ayuda.'''
 

diff --git a/src/pycamp_bot/constants.py b/src/pycamp_bot/constants.py
@@ -0,0 +1 @@
+SENTRY_DATA_SOURCE_NAME_ENVVAR = 'SENTRY_DATA_SOURCE_NAME'