⬆ Upgrade to Pydantic V2 (#8)

* pydantic

* latest poetry

* pydantic settings and python version

* setuptools bc pkg_resources

* black

* update publish

* add tomli

.github/workflows/publish.yml

@@ -19,9 +19,7 @@ jobs:
           python-version: '3.10.0'
 
       # Install poetry
-      - uses: abatilo/actions-poetry@v2.0.0
-        with:
-          poetry-version: "1.1.12"
+      - uses: abatilo/actions-poetry@v2.3.0
 
       # Install deps
       - run: poetry install
@@ -30,4 +28,4 @@ jobs:
       - run: poetry build
 
       # Publish
-      - run: poetry publish --username ${{ secrets.PYPI_USERNAME }} --password ${{ secrets.PYPI_PASSWORD }}
+      - run: poetry publish --username __token__ --password ${{ secrets.PYPI_TOKEN }}

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.10", "3.11", "3.12"]
       fail-fast: false
 
     steps:
@@ -29,9 +29,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install poetry
-        uses: abatilo/actions-poetry@v2.0.0
-        with:
-          poetry-version: "1.1.12"
+        uses: abatilo/actions-poetry@v2.3.0
 
       - name: Install dependencies
         run: poetry install

pyproject.toml

@@ -13,18 +13,19 @@ repository = "https://github.com/rafalstapinski/redispatcher"
 [tool.poetry.dependencies]
 python = "^3.8"
 aioredis = "^1.3.1"
-pydantic = "^1.8.1"
-
-[tool.poetry.dev-dependencies]
-black = "^22.3.0"
-pylint = "^2.13.5"
-isort = "^5.10.1"
-pytest = "^7.1.1"
-elastic-apm = "^6.9.1"
-mkdocs = "^1.3.0"
-mkdocs-material = "^8.2.9"
-pytest-redis = "^2.4.0"
-pytest-asyncio = "^0.18.3"
+pydantic = "^2.6.1"
+pydantic-settings = "^2.2.1"
+
+[tool.poetry.group.dev.dependencies]
+black = "^24.2.0"
+pylint = "^3.0.3"
+isort = "^5.13.2"
+pytest = "^8.0.1"
+pytest-redis = "^3.0.2"
+pytest-asyncio = "^0.23.5"
+elastic-apm = "^6.20.0"
+setuptools = "^69.1.0"
+tomli = "^2.0.1"
 
 [tool.poetry.scripts]
 monitor = "redispatcher.monitor:monitor_cli"

redispatcher/config.py

@@ -1,7 +1,8 @@
 from threading import Event
 from typing import List, Optional, Type, Union
 
-from pydantic import BaseModel, BaseSettings, RedisDsn
+from pydantic import BaseModel, RedisDsn
+from pydantic_settings import BaseSettings
 
 from redispatcher.base_consumer import BaseConsumer
 from redispatcher.types import LoggerType

redispatcher/exceptions.py

@@ -1,14 +1,10 @@
-class RedispatcherException(Exception):
-    ...
+class RedispatcherException(Exception): ...
 
 
-class UndefinedQueue(RedispatcherException):
-    ...
+class UndefinedQueue(RedispatcherException): ...
 
 
-class UndefinedMessage(RedispatcherException):
-    ...
+class UndefinedMessage(RedispatcherException): ...
 
 
-class InvalidConfig(RedispatcherException):
-    ...
+class InvalidConfig(RedispatcherException): ...

test/fixtures/consumers.py

@@ -12,8 +12,7 @@ class Message(BaseConsumer.Message):
         id: int
         text: str
 
-    async def process_message(self, message: Message, headers: BaseConsumer.Headers):
-        ...
+    async def process_message(self, message: Message, headers: BaseConsumer.Headers): ...
 
 
 class ConsumerTwo(BaseConsumer):