Update dependencies for python 3.12+ and relock pdm lockfile for inherit_metadata strategy

khakers · khakers · commit 782e6201d50a · 2025-04-06T13:44:04.000-07:00
Signed-off-by: Khakers &lt;22665282+khakers@users.noreply.github.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ however, insignificant breaking changes do not guarantee a major version bump, s
 ### Breaking
 - Completely rewritten blocklist system. Blocklisting now runs off its own mongoDB collection. This once again introduces backwards incompatible schema changes, so a manual migration is required. You may upgrade from both v4.0 and v4.1 using the `[p]migrate blocklist` command. This removes any need to perform the previous migration steps in v4.1.0, you may upgrade directly to this version. After running the command, blocklist functionality will return and legacy config based blocks will have been deleted. You should always back up your config before migration.
 - Remove internal logviewer plugin
+- Bump Python version to >= 3.12
 
 ### Deprecated
 - Legacy blocklist properties are deprecated and no longer function. They now log a warning when used and provide no functionality. They have been replaced with methods in blocklist.py 
@@ -25,6 +26,8 @@ however, insignificant breaking changes do not guarantee a major version bump, s
 - Replace Pipenv with PDM
 - Bump discord.py version to 2.3.2
 - Rewrote docker build for PDM
+- Use Alpine for docker image
+- Upgrade dependencies for modern python
 
 ### Removed
 - Remove Discord.py dependency version check
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.11
+ARG PYTHON_VERSION=3.12
 FROM python:${PYTHON_VERSION}-alpine AS base
 
 RUN apk update && apk add git \
diff --git a/bot.py b/bot.py
@@ -167,8 +167,9 @@ def hosting_method(self) -> HostingMethod:
 
     def startup(self):
         logger.line()
+        ""
         logger.info(
-            """
+            r"""
   ____                __  ___        __           _ __
  / __ \___  ___ ___  /  |/  /__  ___/ /_ _  ___ _(_) /
 / /_/ / _ \/ -_) _ \/ /|_/ / _ \/ _  /  ' \/ _ `/ / / 
diff --git a/core/migrations.py b/core/migrations.py
@@ -7,7 +7,7 @@
 
 logger = getLogger(__name__)
 
-old_format_matcher = re.compile("by (\w*#\d{1,4})(?: until <t:(\d*):f>)?.")
+old_format_matcher = re.compile(r"by (\w*#\d{1,4})(?: until <t:(\d*):f>)?.")
 
 
 def _convert_legacy_dict_block_format(
diff --git a/dev.docker-compose.yml b/dev.docker-compose.yml
@@ -1,13 +1,18 @@
 services:
   bot:
     image: ghcr.io/khakers/openmodmail:develop
+    restart: no
     build:
         context: .
         dockerfile: Dockerfile
-    # env_file:
-    #   - .env
+        args:
+          INCLUDE_SUPPORTUTILS: true
+          PYTHON_VERSION: 3.13
+#    env_file:
+#      - .env
     environment:
       - CONNECTION_URI=mongodb://mongo
+      - TOKEN=${DISCORD_BOT_TOKEN}
     depends_on:
       - mongo
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -1,6 +1,6 @@
 target "_common" {
   args = {
-    PYTHON_VERSION = "3.11"
+    PYTHON_VERSION = "3.12"
   }
   platforms = ["linux/amd64", "linux/arm64"]
 }
diff --git a/pdm.lock b/pdm.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -57,32 +57,36 @@ gitDescribe = "git describe --tags --dirty"
 # Manually sync with pdm sync-pre-commit
 [project]
 name = "Discord-OpenModmail"
-version = "4.2.0"
+version = "5.0.0-alpha"
 description = "Fork² of a feature rich Discord Modmail bot written in Python."
 authors = [
     {name = "", email = ""},
 ]
 dependencies = [
-    "aiohttp~=3.8.1",
+    "aiohttp~=3.11.16",
     "colorama~=0.4.5",
     "emoji~=1.7.0",
     "isodate~=0.6.0",
-    "motor~=3.1.2",
+    # TODO MOTOR is deprecated for PyMongo 4.9+
+    "motor>=3.7.0",
     "natural~=0.2.0",
     "parsedatetime~=2.6",
     "python-dateutil~=2.8.1",
     "python-dotenv~=1.0.0",
-    "uvloop~=0.17.0; sys_platform != \"win32\"",
-    "requests~=2.31.0",
+    "uvloop~=0.21.0; sys_platform != \"win32\"",
+    "requests>=2.32.0",
     "attrs~=23.1.0",
     "cairocffi~=1.3.0",
-    "cffi~=1.15.0",
+    "cffi>=1.17.1",
     "strenum",
     "discord-py~=2.3.0",
+    # required by discord-py for python >= 3.13
+    # Added as dep in discord-py 2.5.2
+    "audioop-lts; python_version >= '3.13'",
     "setuptools>=69.0.3",
     "packaging>=24.1",
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 readme = "README.md"
 license = {text = "AGPL-3.0-or-later"}
 [project.optional-dependencies]
@@ -99,7 +103,7 @@ build-backend = "pdm.backend"
 # Run `pre-commit install` automatically if applicable
 automaticall-install-hooks = true
 # Should we sync your pre-commit versions with your lockfile (when running lock, add, update, remove, etc.)?
-disable-sync-from-lock = false
+disable-sync-from-lock = true
 # Packages to ignore when syncing from lock
 ignore = []
 # Name of the pre-commit config file to sync with
@@ -112,5 +116,4 @@ dev = [
     "tomli",
     "typing-extensions==4.6.3",
     "pre-commit",
-    "utils @ git+https://github.com/Jerrie-Aries/modmail-plugins.git@master#subdirectory=utils",
 ]
diff --git a/requirements.txt b/requirements.txt
@@ -1,50 +1,54 @@
 # This file is @generated by PDM.
 # Please do not edit it manually.
 
-aiohttp==3.8.6
-aiosignal==1.3.1
-async-timeout==4.0.3
+aiohappyeyeballs==2.6.1
+aiohttp==3.11.16
+aiosignal==1.3.2
 attrs==23.1.0
-black==24.4.2
+audioop-lts==0.2.1; python_version >= "3.13"
+black==25.1.0
 cairocffi==1.3.0
-certifi==2023.7.22
-cffi==1.15.1
+certifi==2025.1.31
+cffi==1.17.1
 cfgv==3.4.0
-charset-normalizer==3.3.2
-click==8.1.7
+charset-normalizer==3.4.1
+click==8.1.8
 colorama==0.4.6
 discord-py==2.3.2
-distlib==0.3.7
-dnspython==2.4.2
+distlib==0.3.9
+dnspython==2.7.0
 emoji==1.7.0
-filelock==3.13.1
-frozenlist==1.4.0
-identify==2.5.31
-idna==3.4
+filelock==3.18.0
+frozenlist==1.5.0
+identify==2.6.9
+idna==3.10
 isodate==0.6.1
-motor==3.1.2
-multidict==6.0.4
+motor==3.7.0
+multidict==6.3.2
 mypy-extensions==1.0.0
 natural==0.2.0
-nodeenv==1.8.0
-packaging==24.1
+nodeenv==1.9.1
+packaging==24.2
 parsedatetime==2.6
-pathspec==0.11.2
-platformdirs==3.11.0
-pre-commit==3.5.0
-pycparser==2.21
-pymongo==4.6.0
+pathspec==0.12.1
+platformdirs==4.3.7
+pre-commit==4.2.0
+propcache==0.3.1
+pycparser==2.22
+pymongo==4.11.3
 python-dateutil==2.8.2
-python-dotenv==1.0.0
-pyyaml==6.0.1
-requests==2.31.0
-ruff==0.4.9
-setuptools==69.0.3
-six==1.16.0
+python-dotenv==1.0.1
+pyyaml==6.0.2
+requests==2.32.3
+ruff==0.11.4
+setuptools==78.1.0
+six==1.17.0
 strenum==0.4.15
-tomli==2.0.1
+tomli==2.2.1
 typing-extensions==4.6.3
-urllib3==2.0.7
-virtualenv==20.24.6
-yarl==1.9.2
+urllib3==2.3.0
+utils @ git+https://github.com/Jerrie-Aries/modmail-plugins.git@0d7ad9c5611d8649022557d5d55848c6ba6f4d4b#subdirectory=utils
+uvloop==0.21.0; sys_platform != "win32"
+virtualenv==20.30.0
+yarl==1.18.3
 --index-url https://pypi.org/simple

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG PYTHON_VERSION=3.11`
	`1`	`+ARG PYTHON_VERSION=3.12`
`2`	`2`	`FROM python:${PYTHON_VERSION}-alpine AS base`
`3`	`3`
`4`	`4`	`RUN apk update && apk add git \`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`target "_common" {`
`2`	`2`	`args = {`
`3`		`- PYTHON_VERSION = "3.11"`
	`3`	`+ PYTHON_VERSION = "3.12"`
`4`	`4`	`}`
`5`	`5`	`platforms = ["linux/amd64", "linux/arm64"]`
`6`	`6`	`}`