Update Python warnings configuration in .env.sample

.env.sample

@@ -7,7 +7,7 @@ LOG_LEVEL=DEBUG
 openweathermap_token=token
 PORT=5000
 POSTGRES_PASSWORD=password
-PYTHONWARNINGS=ignore:Unverified HTTPS request
+PYTHONWARNINGS="ignore:Unverified HTTPS request"
 TMDB_API_KEY=somekey
 TOKEN=token
 TWITTER_ACCESS_TOKEN_SECRET=secret

.pre-commit-config.yaml

@@ -28,10 +28,16 @@ repos:
         args: [--py311-plus]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.4.2'
+    rev: 'v0.4.7'
     hooks:
       # Run the linter
       - id: ruff
         args: ["--fix"]
       # Run the formatter
       - id: ruff-format
+
+  - repo: https://github.com/pycqa/isort
+    rev: 5.13.2  # Use the ref you want to point at
+    hooks:
+      - id: isort
+        args: ["--profile", "black"]

Dockerfile

@@ -21,7 +21,7 @@ RUN apt-get update && \
     apt-get autoclean -y && \
     rm -rf /var/lib/apt/lists/*
 
-RUN pip install -U wheel pip
+RUN pip install -U wheel pip pip-tools
 
 COPY pyproject.toml requirements.txt ./
 

docker-compose.yml

@@ -1,11 +1,8 @@
-version: '3.9'
-
 volumes:
   pgdata:
   shell_history:
 
 services:
-
   eduzenbot:
     tty: true
     image: eduzen/bot:latest

eduzenbot/__main__.py

@@ -2,8 +2,10 @@
 
 import logging
 import os
+from pathlib import Path
 
 import sentry_sdk
+from dotenv import load_dotenv
 from rich.logging import RichHandler
 from telegram.ext import CallbackQueryHandler, CommandHandler, Filters
 
@@ -13,8 +15,6 @@
 from eduzenbot.plugins.messages.unknown import unknown
 from eduzenbot.scripts.initialize_db import create_db_tables
 from eduzenbot.telegram_bot import TelegramBot
-from dotenv import load_dotenv
-from pathlib import Path
 
 # Load environment variables from .env file
 env_path = Path("../.env")

eduzenbot/auth/restricted.py

@@ -1,7 +1,7 @@
 import logging
 import os
-from functools import wraps
 from collections.abc import Callable
+from functools import wraps
 
 from telegram import Update
 from telegram.ext import CallbackContext

eduzenbot/decorators.py

@@ -1,8 +1,8 @@
 import functools
 import logging
+from collections.abc import Callable
 from functools import wraps
 from typing import Any
-from collections.abc import Callable
 
 import peewee
 from telegram import Update

eduzenbot/plugins/commands/hackernews/command.py

@@ -7,7 +7,6 @@
 from types import SimpleNamespace
 from typing import Any
 
-import pendulum
 import requests
 from cachetools import TTLCache, cached
 from telegram import ChatAction, Update
@@ -73,14 +72,14 @@ def get_hackernews_help(story_type: STORIES = STORIES.TOP) -> str:
 def parse_hackernews(story_id: int) -> str:
     raw_story = get_item(story_id)
     story = SimpleNamespace(**raw_story)
-    now = pendulum.now()
-    date = now - pendulum.from_timestamp(story.time)
+    # now = pendulum.now()
+    # date = now - pendulum.from_timestamp(story.time)
     try:
         url = story.url
     except AttributeError:
         url = ""
     story_text = (
-        f"[{story.title}]({url})\n Score: {story.score} Hace: {date.in_words()}"
+        f"[{story.title}]({url})\n"  # Score: {story.score} Hace: {date.in_words()}"
     )
     return story_text
 

eduzenbot/telegram_bot.py

@@ -2,10 +2,9 @@
 import logging
 import os
 import pkgutil
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from functools import partial
 from typing import Any
-from collections.abc import Callable
 
 import attr
 import pytz

justfile

@@ -1,7 +1,7 @@
 set dotenv-load := true
 
-dco := "docker-compose"
-run := "{{dco}} run --rm eduzenbot"
+dco := "docker compose"
+run := "docker compose run --rm eduzenbot"
 
 os:
   #!/usr/bin/env bash
@@ -18,6 +18,17 @@ dockershell:
   #!/usr/bin/env bash
   {{run}} eduzenbot bash
 
+update-requirements-dev:
+  {{run}} pip-compile --upgrade --extra=dev pyproject.toml -o requirements-dev.txt
+
+update-requirements-prod:
+  {{run}} pip-compile --upgrade pyproject.toml -o requirements.txt
+
+update-requirements:
+  just update-requirements-dev
+  just update-requirements-prod
+
+
 test:
   #!/usr/bin/env bash
   {{run}} pytest --cov=eduzenbot --cov-report=term-missing
@@ -51,6 +62,12 @@ compile:
 compile-dev:
   pip-compile --extra=dev pyproject.toml -o requirements-dev.txt
 
+format:
+  pre-commit run --all-files
+
+fmt:
+  just format
+
 clean:
   #!/usr/bin/env python3
   import pathlib, shutil