Merge pull request 'Update dependency pytz to v2025' (#89) from renovate/pytz-2025.x into main

Reviewed-on: #89
Reviewed-by: imcompiling <[email protected]>

.gitea/workflows/build_develop.yaml

@@ -5,13 +5,15 @@ on:
     branches:
       - '*'
       - '!main'
+    paths-ignore:
+        - "README.md"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install Docker

.gitea/workflows/build_latest.yaml

@@ -3,13 +3,15 @@ name: build_latest
 on:
   push:
     branches: [main]
+    paths-ignore:
+        - "README.md"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install Docker

.gitea/workflows/build_release.yaml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install Docker

.gitignore

@@ -105,7 +105,6 @@ venv/
 ENV/
 env.bak/
 venv.bak/
-poetry.lock
 
 # Spyder project settings
 .spyderproject

.vscode/settings.json

@@ -3,6 +3,8 @@
         "aiofiles",
         "autofilled",
         "blurple",
+        "CAKEDAY",
+        "cakedays",
         "CLANLEADER",
         "Dakiny",
         "DISCORDMANAGER",

Dockerfile

@@ -1,10 +1,10 @@
-FROM python:3.12.3-slim
+FROM python:3.13.2-slim
 
 # install dependencies
 RUN apt-get update && apt-get -y upgrade && apt-get -y install git sqlite3
 
 # install uv
-COPY --from=ghcr.io/astral-sh/uv:0.6.5 /uv /uvx /bin/
+COPY --from=ghcr.io/astral-sh/uv:0.6.9 /uv /uvx /bin/
 
 COPY . /home
 

dakiny_bot/app.py

@@ -38,8 +38,8 @@ def run() -> None:
     bot = commands.Bot(intents=intents)
 
     # Get the modules of all cogs whose directory structure is ./cogs/<module_name>
-    for folder in os.listdir("cogs"):
-        bot.load_extension(f"cogs.{folder}")
+    for folder in os.listdir("dakiny_bot/cogs"):
+        bot.load_extension(f"dakiny_bot.cogs.{folder}")
 
     @bot.listen()
     async def on_ready() -> None:

dakiny_bot/classes/election.py

@@ -201,7 +201,7 @@ class Election:
         election_thread: nextcord.Thread = self.guild.get_thread(self.get_election_info().ThreadId)
         await election_thread.send(message)
         vote_msg = await election_thread.send(
-            build_votes_str(settings, self.guild),
+            build_votes_str(self.guild),
             view=VoteView(self.guild),
         )
 

dakiny_bot/classes/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.ruff]
 # Extend the `pyproject.toml` file in the parent directory...
-extend = "../pyproject.toml"
+extend = "../../pyproject.toml"
 
 # Exclude a variety of commonly ignored directories.
 exclude = ["gitea_webhook.py"]

dakiny_bot/classes/voting_views.py

@@ -67,7 +67,7 @@ class VoteSelect(nextcord.ui.StringSelect):
                 session.execute(stmt)
                 session.commit()
 
-        vote_message_str = build_votes_str(settings, interaction.guild)
+        vote_message_str = build_votes_str(interaction.guild)
         vote_msg: nextcord.Message = await interaction.channel.fetch_message(vote_msg_id)
         await vote_msg.edit(content=vote_message_str)
 

dakiny_bot/cogs/loops/daily_loop.py

@@ -20,6 +20,8 @@ if TYPE_CHECKING:
 
 KANDY = 239547993106284544
 
+IGNORE_CAKEDAY = [266378407682506754]
+
 
 class DailyLoop(commands.Cog, name="Daily Loop"):
     """Class for performing daily functions."""
@@ -112,7 +114,11 @@ class DailyLoop(commands.Cog, name="Daily Loop"):
         announce_channel: nextcord.TextChannel = guild.get_channel(settings.channel_ids.general)
 
         cakedays: list[nextcord.Member] = [
-            human for human in guild.humans if human.joined_at.month == today.month and human.joined_at.day == today.day
+            human
+            for human in guild.humans
+            if human.joined_at.month == today.month
+            and human.joined_at.day == today.day
+            and human.id not in IGNORE_CAKEDAY
         ]
 
         for member in cakedays:

dakiny_bot/database/__init__.py

@@ -0,0 +1 @@
+"""Module controls connection to Dakiny bot database."""

dakiny_bot/database/create_database.py

@@ -7,7 +7,7 @@ if not Path("database/dakiny.db").exists():
     with sqlite3.connect("database/dakiny.db") as con:
         cur = con.cursor()
 
-        with Path("database_setup/database.sql", encoding="utf-8").open() as file:
+        with Path("dakiny_bot/database/database.sql").open() as file:
             database_script = file.read()
             cur.executescript(database_script)
             con.commit()

dakiny_bot/database/pyproject.toml

@@ -1,7 +0,0 @@
-[tool.ruff]
-# Extend the `pyproject.toml` file in the parent directory...
-extend = "../pyproject.toml"
-
-[tool.ruff.lint]
-# ignore implicit-namespace-package in this directory.
-ignore = ["INP001"]

pyproject.toml

@@ -6,7 +6,7 @@ dependencies = [
     "fastapi<1.0.0,>=0.111.0",
     "nextcord<3.0.0,>=2.6.0",
     "pandas<3.0.0,>=2.2.2",
-    "pytz<2025.0,>=2024.1",
+    "pytz<2025.2,>=2025.1",
     "sqlalchemy<3.0.0,>=2.0.30",
     "aiofiles<24.0.0,>=23.2.1",
     "setuptools<71.0.0,>=70.0.0",

renovate.json

@@ -0,0 +1,20 @@
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "lockFileMaintenance": {
+        "automerge": true,
+        "enabled": true
+    },
+    "minor": {
+        "automerge": true,
+        "automergeType": "branch"
+    },
+    "patch": {
+        "automerge": true,
+        "automergeType": "branch"
+    },
+    "pin": {
+        "automerge": true,
+        "automergeType": "branch"
+    },
+    "ignoreTests": true
+}

uv.lock

@@ -1,4 +1,5 @@
 version = 1
+revision = 1
 requires-python = ">=3.12, <4.0"
 
 [[package]]
@@ -161,7 +162,7 @@ requires-dist = [
     { name = "gitpython", specifier = ">=3.1.43,<4.0.0" },
     { name = "nextcord", specifier = ">=2.6.0,<3.0.0" },
     { name = "pandas", specifier = ">=2.2.2,<3.0.0" },
-    { name = "pytz", specifier = ">=2024.1,<2025.0" },
+    { name = "pytz", specifier = ">=2025.1,<2025.2" },
     { name = "setuptools", specifier = ">=70.0.0,<71.0.0" },
     { name = "sqlalchemy", specifier = ">=2.0.30,<3.0.0" },
     { name = "uvicorn", specifier = ">=0.34.0" },
@@ -544,11 +545,11 @@ wheels = [
 
 [[package]]
 name = "pytz"
-version = "2024.2"
+version = "2025.1"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/3a/31/3c70bf7603cc2dca0f19bdc53b4537a797747a58875b552c8c413d963a3f/pytz-2024.2.tar.gz", hash = "sha256:2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a", size = 319692 }
+sdist = { url = "https://files.pythonhosted.org/packages/5f/57/df1c9157c8d5a05117e455d66fd7cf6dbc46974f832b1058ed4856785d8a/pytz-2025.1.tar.gz", hash = "sha256:c2db42be2a2518b28e65f9207c4d05e6ff547d1efa4086469ef855e4ab70178e", size = 319617 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/11/c3/005fcca25ce078d2cc29fd559379817424e94885510568bc1bc53d7d5846/pytz-2024.2-py2.py3-none-any.whl", hash = "sha256:31c7c1817eb7fae7ca4b8c7ee50c72f93aa2dd863de768e1ef4245d426aa0725", size = 508002 },
+    { url = "https://files.pythonhosted.org/packages/eb/38/ac33370d784287baa1c3d538978b5e2ea064d4c1b93ffbd12826c190dd10/pytz-2025.1-py2.py3-none-any.whl", hash = "sha256:89dd22dca55b46eac6eda23b2d72721bf1bdfef212645d81513ef5d03038de57", size = 507930 },
 ]
 
 [[package]]