ci: fix dependencies and pipeline

.dockerignore

@@ -1,8 +1,5 @@
 *
-!Dockerfile
-!.dockerignore
 !casbin_tortoise_adapter
 !tests
 !pdm.lock
 !pyproject.toml
-!README.md

.github/workflows/ci.yaml

@@ -36,19 +36,21 @@ jobs:
           POSTGRES_PASSWORD: "password"
           POSTGRES_DB: "casbin_rule"
         options: >-
-          --health-cmd "pg_isready"
+          --health-cmd "pg_isready -U postgres"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up PDM
-        uses: pdm-project/setup-pdm@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-          cache: true
+          cache: "pip"
       - name: Install dependencies
-        run: pdm install -G :all
+        run: pip install -r requirements.txt
       - name: Run tests
-        run: pdm run pytest
+        run: pytest
+        env:
+          POSTGRES_HOST: "localhost"

.gitignore

@@ -4,7 +4,6 @@
 !.vscode/settings.json
 .pdm-python
 .venv
-pdm.lock
 
 # caches
 .pytest_cache

.pre-commit-config.yaml

@@ -13,11 +13,14 @@ repos:
         require_serial: true
         args: ["--explicit-package-bases", "--check-untyped-defs"]
         additional_dependencies:
-          [
-            "asynccasbin<2.0.0,>=1.1.2",
-            'tortoise-orm[accel]>=0.19.1; python_version < "3.8"',
-            'tortoise-orm[accel]>=0.20; python_version >= "3.8"',
-          ]
+          ["asynccasbin<2.0.0,>=1.1.2", "tortoise-orm[accel]>=0.18.0"]
+  - repo: https://github.com/pdm-project/pdm
+    rev: 2.10.4
+    hooks:
+      - id: pdm-lock-check
+      - id: pdm-export
+        args: ["-G", ":all", "--pyproject", "-o", "requirements.txt"]
+        files: ^pdm.lock$
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:

Dockerfile

@@ -1,16 +1,18 @@
 # syntax=docker/dockerfile:1
 
-FROM python:3.11
+FROM python:3.7
+
+WORKDIR /casbin-tortoise
 
 RUN pip install -U pip setuptools wheel && \
-    pip install pdm
+    pip install pdm~=2.10.0
 
-WORKDIR /casbin-tortoise
-COPY pyproject.toml pdm.lock /casbin-tortoise
-RUN pdm export -G :all -o requirements.txt --without-hashes && \
+COPY pyproject.toml pyproject.toml
+
+RUN pdm export -G :all --pyproject -o requirements.txt && \
     pip install -r requirements.txt
 
-COPY . ./casbin-tortoise
+COPY . .
 
 ENV PYTHONPATH=/casbin-tortoise
 

casbin_tortoise_adapter/adapter.py

@@ -39,7 +39,7 @@ def __init__(self, modelclass: Type[CasbinRule] = CasbinRule) -> None:
         self.modelclass: Type[CasbinRule] = modelclass
         self._filtered: bool = False
 
-    async def load_policy(self, model: Model) -> None:
+    async def load_policy(self, model: Model) -> None:  # pyright: ignore
         """Loads all policy rules from storage."""
         for line in await self.modelclass.all():
             load_policy_line(str(line), model)

docker-compose.yaml

@@ -5,7 +5,7 @@ services:
       POSTGRES_PASSWORD: "password"
       POSTGRES_DB: "casbin_rule"
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER"]
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
       interval: 10s
       timeout: 5s
       retries: 5

pyproject.toml

@@ -19,8 +19,7 @@ authors = [
 requires-python = ">=3.7,<4.0"
 dependencies = [
     "asynccasbin<2.0.0,>=1.1.2",
-    "tortoise-orm[accel]>=0.19.1; python_version < \"3.8\"",
-    "tortoise-orm[accel]>=0.20; python_version >= \"3.8\"",
+    "tortoise-orm[accel]>=0.18.0"
 ]
 
 [project.urls]
@@ -31,9 +30,10 @@ changelog = "https://github.com/thearchitector/casbin-tortoise-adapter/blob/main
 [tool.pdm]
 [tool.pdm.dev-dependencies]
 dev = [
-    "pytest<8.0,>=7.1",
-    "pytest-asyncio>=0.15.1",
-    "asyncpg>=0.28.0",
+    "pytest~=7.0",
+    "pluggy~=1.2.0",
+    "pytest-asyncio~=0.21.0",
+    "asyncpg~=0.28.0",
 ]
 
 [tool.pytest.ini_options]

tests/conftest.py

@@ -1,4 +1,5 @@
 import asyncio
+import os
 
 import pytest
 from casbin import Enforcer
@@ -16,11 +17,13 @@ def event_loop():
 
 @pytest.fixture(scope="session")
 async def adapter():
+    host: str = os.getenv("POSTGRES_HOST", "postgres")
+
     # connect to db and generate schemas
     await Tortoise.init(
         {
             "connections": {
-                "default": "postgres://postgres:password@postgres:5432/casbin"
+                "default": f"postgres://postgres:password@{host}:5432/casbin"
             },
             "apps": {"my_app": {"models": ["casbin_tortoise_adapter"]}},
         },