Merge branch 'main' into incident/daemon-stall-report

2026-09-10 22:04:17 +00:00
parent 90625c5722 b1aec1b563
commit 5d42c2dd18
1 changed files with 3 additions and 3 deletions
@@ -33,9 +33,9 @@ jobs:
          no_proxy: "*"
        run: |
          rm -rf /tmp/ci-venv-deploy
-          python3 -m venv /tmp/ci-venv-deploy
+          /usr/bin/python3 -m venv /tmp/ci-venv-deploy  # 钉解释器 3.9.6：同 ci.yml 修复（#134），brew python3=3.14 的 tokenize 漂移致 E122 假阳性
          /tmp/ci-venv-deploy/bin/pip install --quiet --upgrade pip
-          /tmp/ci-venv-deploy/bin/pip install --quiet flake8 fastapi pydantic pyyaml uvicorn requests pytest pytest-asyncio httpx
+          /tmp/ci-venv-deploy/bin/pip install --quiet 'flake8==7.3.0' fastapi 'pydantic<2' pyyaml uvicorn requests pytest pytest-asyncio httpx  # 锁版本：pydantic<2（代码库 v1 基线，未锁会装 v2 import 崩）+ flake8 防漂移

      - name: Lint
        run: |
@@ -43,7 +43,7 @@ jobs:

      - name: Unit & Integration Tests
        run: |
-          /tmp/ci-venv-deploy/bin/pytest tests/ -m "not e2e" -x -q
+          PYTHONPATH=$(pwd) /tmp/ci-venv-deploy/bin/pytest tests/ -m "not e2e" -x -q  # 对齐 ci.yml test 配方

  # ── Job 2: 部署 ─────────────────────────────────────
  deploy: