Merge remote-tracking branch 'origin/main' into develop

将原有的lint、typecheck和测试工作流合并为单个CI任务，重构release工作流以支持Gitea发布，简化pypi发布步骤

.github/workflows/ci.yml

@@ -9,34 +9,12 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  lint-and-typecheck:
+  ci:
-    name: Lint & Typecheck
+    name: Lint, Typecheck & Test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - uses: astral-sh/setup-uv@v5
-        with:
-          enable-cache: true
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.13'
-
-      - run: uv sync
-      - run: uv run ruff check src tests
-      - run: uv run pyrefly check .
-
-  test:
-    name: Test (${{ matrix.os }})
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-    steps:
-      - uses: actions/checkout@v4
-
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
@@ -47,4 +25,7 @@ jobs:
             3.8
             3.13
 
+      - run: uv sync
+      - run: uv run ruff check src tests
+      - run: uv run pyrefly check .
       - run: uvx tox run -e py38,py313

.github/workflows/release.yml

@@ -6,13 +6,11 @@ on:
 
 permissions:
   contents: write
-  id-token: write
 
 jobs:
-  build:
+  release:
+    name: Build, Publish & Release
     runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.version.outputs.version }}
     steps:
       - uses: actions/checkout@v4
 
@@ -26,36 +24,24 @@ jobs:
 
       - run: uv build
 
-      - id: version
-        run: echo "version=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
-
-      - uses: actions/upload-artifact@v7
-        with:
-          name: dist
-          path: dist/
-
-  publish-pypi:
-    needs: build
-    runs-on: ubuntu-latest
-    environment: pypi
-    steps:
-      - uses: actions/download-artifact@v8
-        with:
-          name: dist
-          path: dist
-
       - uses: pypa/gh-action-pypi-publish@release/v1
-
-  release:
-    needs: [build, publish-pypi]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/download-artifact@v8
         with:
-          name: dist
+          password: ${{ secrets.PYPI_API_TOKEN }}
-          path: dist
 
-      - uses: softprops/action-gh-release@v2
+      - name: Create Gitea Release
-        with:
+        run: |
-          files: dist/*
+          VERSION=${GITHUB_REF#refs/tags/v}
-          generate_release_notes: true
+          REPO=${GITHUB_REPOSITORY}
+          UPLOAD_URL=$(curl -s -X POST "https://git.gookeryoung.cn/api/v1/repos/${REPO}/releases" \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            -d "{\"tag_name\": \"v${VERSION}\", \"name\": \"v${VERSION}\", \"draft\": false, \"prerelease\": false}" \
+            | jq -r '.upload_url')
+          for file in dist/*; do
+            curl -s -X POST "${UPLOAD_URL}?name=$(basename $file)" \
+              -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+              -H "Content-Type: application/octet-stream" \
+              --data-binary @"$file"
+          done
+        env:
+          GITEA_URL: ${{ secrets.GITEA_URL || 'https://git.gookeryoung.cn' }}

.gitignore

@@ -10,3 +10,4 @@ wheels/
 .venv
 .coverage
 .idea
+*_profile.html

pyproject.toml

@@ -21,7 +21,7 @@ license = { text = "MIT" }
 name = "pyflowx"
 readme = "README.md"
 requires-python = ">=3.8"
-version = "0.2.13"
+version = "0.3.0"
 
 [project.scripts]
 autofmt     = "pyflowx.cli.autofmt:main"

src/pyflowx/__init__.py

@@ -100,7 +100,7 @@ from .task import (
     task_template,
 )
 
-__version__ = "0.3.7"
+__version__ = "0.4.0"
 
 __all__ = [
     "IS_LINUX",

src/pyflowx/cli/dev/envdev.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import argparse
+import getpass
 from pathlib import Path
 from typing import Literal, get_args
 
@@ -254,6 +255,31 @@ def main() -> None:
             allow_upstream_skip=True,
             verbose=True,
         ),
+        # 安装 Docker
+        px.TaskSpec(
+            "install_docker",
+            cmd=["sudo", "apt", "install", "-y", "docker-compose-v2"],
+            conditions=(BuiltinConditions.IS_LINUX(),),
+            depends_on=("install_mirror",),
+            allow_upstream_skip=True,
+            verbose=True,
+        ),
+        px.TaskSpec(
+            "add_docker_group",
+            cmd=["sudo", "usermod", "-aG", "docker", getpass.getuser()],
+            conditions=(BuiltinConditions.IS_LINUX(),),
+            depends_on=("install_docker",),
+            allow_upstream_skip=True,
+            verbose=True,
+        ),
+        px.TaskSpec(
+            "refresh_docker_group",
+            cmd=["newgrp", "docker"],
+            conditions=(BuiltinConditions.IS_LINUX(),),
+            depends_on=("add_docker_group",),
+            allow_upstream_skip=True,
+            verbose=True,
+        ),
         # 设置 Python 环境变量
         *setenv_group({
             "PIP_INDEX_URL": PIP_INDEX_URLS[python_mirror],

src/pyflowx/cli/pymake.py

@@ -6,39 +6,48 @@
 
 from __future__ import annotations
 
+from pathlib import Path
+
 import pyflowx as px
 from pyflowx.conditions import Constants
 
+# 项目根目录（pymake.py 在 src/pyflowx/cli，向上四层到达根目录）
+ROOT_DIR = Path(__file__).parent.parent.parent.parent
+
 MATURIN_BUILD_COMMAND = ["maturin", "build", "-r"]
 if Constants.IS_WINDOWS:
     MATURIN_BUILD_COMMAND.extend(["--target", "x86_64-win7-windows-msvc", "-Zbuild-std", "-i", "python3.8"])
 
 # 扁平注册所有任务（px.cmd 自动从命令前两段推导 name）
+# 所有任务指定 cwd=ROOT_DIR，确保在项目根目录执行
 tasks: list[px.TaskSpec] = [
-    px.cmd(["uv", "build"]),
+    px.cmd(["uv", "build"], cwd=ROOT_DIR),
-    px.cmd(MATURIN_BUILD_COMMAND),
+    px.cmd(MATURIN_BUILD_COMMAND, cwd=ROOT_DIR),
-    px.cmd(["uv", "sync"]),
+    px.cmd(["uv", "sync"], cwd=ROOT_DIR),
-    px.cmd(["gitt", "c"], name="git_clean"),
+    px.cmd(["gitt", "c"], name="git_clean", cwd=ROOT_DIR),
     px.cmd(
         ["pytest", "-m", "not slow", "-n", "8", "--dist", "loadfile", "--color=yes", "--durations=10"],
         name="test",
+        cwd=ROOT_DIR,
     ),
     px.cmd(
         ["pytest", "-m", "not slow", "--dist", "loadfile", "--color=yes", "--durations=10"],
         name="test_fast",
+        cwd=ROOT_DIR,
     ),
     px.cmd(
         ["pytest", "--cov", "-n", "8", "--dist", "loadfile", "--tb=short", "-v", "--color=yes", "--durations=10"],
         name="test_coverage",
+        cwd=ROOT_DIR,
     ),
-    px.cmd(["pyrefly", "check", "."]),
+    px.cmd(["pyrefly", "check", "."], cwd=ROOT_DIR),
-    px.cmd(["git", "add", "-A"], name="git_add_all"),
+    px.cmd(["git", "add", "-A"], name="git_add_all", cwd=ROOT_DIR),
-    px.cmd(["bumpversion"]),
+    px.cmd(["bumpversion"], cwd=ROOT_DIR),
-    px.cmd(["bumpversion", "minor"]),
+    px.cmd(["bumpversion", "minor"], cwd=ROOT_DIR),
-    px.cmd(["git", "push"]),
+    px.cmd(["git", "push"], cwd=ROOT_DIR),
-    px.cmd(["git", "push", "--tags"], name="git_push_tags"),
+    px.cmd(["git", "push", "--tags"], name="git_push_tags", cwd=ROOT_DIR),
-    px.cmd(["hatch", "publish"], name="publish_python"),
+    px.cmd(["hatch", "publish"], name="publish_python", cwd=ROOT_DIR),
-    px.cmd(["twine", "upload", "--disable-progress-bar"], name="twine_publish"),
+    px.cmd(["twine", "upload", "--disable-progress-bar"], name="twine_publish", cwd=ROOT_DIR),
 ]
 
 # 单任务别名（alias 名与任务名相同）：直接内联 TaskSpec，避免 str 自引用
@@ -55,13 +64,13 @@ aliases: dict[str, str | list[str | px.TaskSpec] | px.TaskSpec | px.Graph] = {
     "bump": ["c", "tc", "git_add_all", "bumpversion"],
     "bumpmi": "bumpversion_minor",
     "cov": ["git_clean", "test_coverage"],
-    "doc": px.cmd(["sphinx-build", "-b", "html", "docs", "docs/_build"], name="doc"),
+    "doc": px.cmd(["sphinx-build", "-b", "html", "docs", "docs/_build"], name="doc", cwd=ROOT_DIR),
-    "lint": px.cmd(["ruff", "check", "--fix", "--unsafe-fixes"], name="lint"),
+    "lint": px.cmd(["ruff", "check", "--fix", "--unsafe-fixes"], name="lint", cwd=ROOT_DIR),
     "pb": ["twine_publish", "publish_python"],
     "t": "test",
     "tf": "test_fast",
     "tc": ["pyrefly_check", "lint"],
-    "tox": px.cmd(["tox", "-p", "auto"], name="tox"),
+    "tox": px.cmd(["tox", "-p", "auto"], name="tox", cwd=ROOT_DIR),
     # 发布命令
     "p": ["git_clean", "git_push", "git_push_tags"],
 }

tests/cli/test_pymake.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from pathlib import Path
 from unittest.mock import patch
 
 import pytest
@@ -123,6 +124,22 @@ class TestTaskSpecDefinitions:
         assert spec.cmd == ["tox", "-p", "auto"]
         assert spec.skip_if_missing is False
 
+    def test_all_tasks_have_correct_cwd(self) -> None:
+        """所有任务应该有正确的 cwd 设置（指向项目根目录）."""
+        # 验证 ROOT_DIR 定义正确（向上三层到达项目根目录）
+        expected_root = Path(__file__).parent.parent.parent
+        assert expected_root == pymake.ROOT_DIR
+
+        # 验证 tasks 中的所有命令任务都有正确的 cwd
+        for spec in pymake.tasks:
+            if spec.cmd is not None:
+                assert spec.cwd == pymake.ROOT_DIR, f"任务 {spec.name} 的 cwd 应为 {pymake.ROOT_DIR}"
+
+        # 验证 aliases 中的内联任务（doc/lint/tox）也有正确的 cwd
+        for name in ("doc", "lint", "tox"):
+            spec = _find_task(name)
+            assert spec.cwd == pymake.ROOT_DIR, f"任务 {name} 的 cwd 应为 {pymake.ROOT_DIR}"
+
 
 # ---------------------------------------------------------------------- #
 # main function

tests/test_profiling.py

@@ -531,16 +531,23 @@ class TestIntegrationWithRun:
 
     def test_profile_from_real_run(self) -> None:
         """从真实 run() 结果构建剖面."""
+        import time
+
+        def slow() -> int:
+            time.sleep(0.01)  # 确保任务有实际耗时，避免 duration 极小导致并行度计算为 0
+            return 1
+
         graph = px.Graph.from_specs([
-            px.TaskSpec("a", lambda: 1),
+            px.TaskSpec("a", slow),
-            px.TaskSpec("b", lambda: 2, depends_on=("a",)),
+            px.TaskSpec("b", slow, depends_on=("a",)),
-            px.TaskSpec("c", lambda: 3, depends_on=("a",)),
+            px.TaskSpec("c", slow, depends_on=("a",)),
         ])
         report = px.run(graph, strategy="sequential")
 
         profile = ProfileReport.from_report(report, graph)
 
         assert len(profile.tasks) == 3
+        # sequential 策略下应为串行，duration > 0
         assert profile.critical_path_duration > 0
         # sequential 策略下并行度应为 1
         assert profile.peak_parallelism == 1

tests/test_task.py

@@ -193,8 +193,8 @@ def test_should_execute_skip_if_missing_cmd_not_found() -> None:
 
 def test_should_execute_skip_if_missing_cmd_found() -> None:
     """skip_if_missing 但命令存在时应执行."""
-    # 使用 Python 作为已安装的命令
+    # 使用 Python 作为已安装的命令（Windows 上 echo 是 shell 内置，shutil.which 找不到）
-    spec = TaskSpec("a", cmd=["echo"], skip_if_missing=True)  # echo 应存在
+    spec = TaskSpec("a", cmd=["python"], skip_if_missing=True)  # python 应存在
     should_run, reason = spec.should_execute({})
     assert should_run is True
     assert reason is None

uv.lock

@@ -5603,7 +5603,7 @@ pycountry = [
 
 [[package]]
 name = "pyflowx"
-version = "0.2.12"
+version = "0.2.13"
 source = { editable = "." }
 dependencies = [
     { name = "graphlib-backport", marker = "python_full_version < '3.9'" },