Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9cfcfb38e4 | |||
| 69db241611 | |||
| 66e6295a24 | |||
| aebb4fce68 | |||
| 7784c8ff86 | |||
| 77918a5568 | |||
| 7e4c615dc7 | |||
| ac5082523e | |||
| 0df6f7c8ac | |||
| 4b66176ce6 | |||
| cf6b6fd059 | |||
| 6f93e6eb6d | |||
| 43e1aad1fe |
@@ -9,42 +9,24 @@ concurrency:
|
|||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
lint-and-typecheck:
|
ci:
|
||||||
name: Lint & Typecheck
|
name: Lint, Typecheck & Test
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: http://gitea:3000/zhou/checkout.git@main
|
||||||
|
|
||||||
- uses: astral-sh/setup-uv@v5
|
- uses: http://gitea:3000/zhou/setup-uv.git@v8.1.0
|
||||||
with:
|
with:
|
||||||
|
uv-version: "0.5.21" # 或 "0.6.0" 等你需要的版本
|
||||||
enable-cache: true
|
enable-cache: true
|
||||||
|
|
||||||
- uses: actions/setup-python@v5
|
- uses: http://gitea:3000/zhou/setup-python.git@v6
|
||||||
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
|
|
||||||
|
|
||||||
- uses: actions/setup-python@v5
|
|
||||||
with:
|
with:
|
||||||
python-version: |
|
python-version: |
|
||||||
3.8
|
3.8
|
||||||
3.13
|
3.13
|
||||||
|
|
||||||
|
- run: uv sync
|
||||||
|
- run: uv run ruff check src tests
|
||||||
|
- run: uv run pyrefly check .
|
||||||
- run: uvx tox run -e py38,py313
|
- run: uvx tox run -e py38,py313
|
||||||
|
|||||||
@@ -6,56 +6,42 @@ on:
|
|||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
id-token: write
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
release:
|
||||||
|
name: Build, Publish & Release
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
outputs:
|
|
||||||
version: ${{ steps.version.outputs.version }}
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: http://gitea:3000/zhou/checkout.git@v4
|
||||||
|
|
||||||
- uses: astral-sh/setup-uv@v5
|
- uses: http://gitea:3000/zhou/setup-uv.git@v8.1.0
|
||||||
with:
|
with:
|
||||||
enable-cache: true
|
enable-cache: true
|
||||||
|
|
||||||
- uses: actions/setup-python@v5
|
- uses: http://gitea:3000/zhou/setup-python.git@v6
|
||||||
with:
|
with:
|
||||||
python-version: '3.13'
|
python-version: '3.13'
|
||||||
|
|
||||||
- run: uv build
|
- run: uv build
|
||||||
|
|
||||||
- id: version
|
- uses: http://gitea:3000/zhou/gh-action-pypi-publish.git@release/v1
|
||||||
run: echo "version=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v7
|
|
||||||
with:
|
with:
|
||||||
name: dist
|
password: ${{ secrets.PYPI_API_TOKEN }}
|
||||||
path: dist/
|
|
||||||
|
|
||||||
publish-pypi:
|
- name: Create Gitea Release
|
||||||
needs: build
|
run: |
|
||||||
runs-on: ubuntu-latest
|
VERSION=${GITHUB_REF#refs/tags/v}
|
||||||
environment: pypi
|
REPO=${GITHUB_REPOSITORY}
|
||||||
steps:
|
UPLOAD_URL=$(curl -s -X POST "https://git.gookeryoung.cn/api/v1/repos/${REPO}/releases" \
|
||||||
- uses: actions/download-artifact@v8
|
-H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
|
||||||
with:
|
-H "Content-Type: application/json" \
|
||||||
name: dist
|
-d "{\"tag_name\": \"v${VERSION}\", \"name\": \"v${VERSION}\", \"draft\": false, \"prerelease\": false}" \
|
||||||
path: dist
|
| jq -r '.upload_url')
|
||||||
|
for file in dist/*; do
|
||||||
- uses: pypa/gh-action-pypi-publish@release/v1
|
curl -s -X POST "${UPLOAD_URL}?name=$(basename $file)" \
|
||||||
|
-H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
|
||||||
release:
|
-H "Content-Type: application/octet-stream" \
|
||||||
needs: [build, publish-pypi]
|
--data-binary @"$file"
|
||||||
runs-on: ubuntu-latest
|
done
|
||||||
steps:
|
env:
|
||||||
- uses: actions/download-artifact@v8
|
GITEA_URL: ${{ secrets.GITEA_URL || 'https://git.gookeryoung.cn' }}
|
||||||
with:
|
|
||||||
name: dist
|
|
||||||
path: dist
|
|
||||||
|
|
||||||
- uses: softprops/action-gh-release@v2
|
|
||||||
with:
|
|
||||||
files: dist/*
|
|
||||||
generate_release_notes: true
|
|
||||||
|
|||||||
@@ -10,3 +10,4 @@ wheels/
|
|||||||
.venv
|
.venv
|
||||||
.coverage
|
.coverage
|
||||||
.idea
|
.idea
|
||||||
|
*_profile.html
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ license = { text = "MIT" }
|
|||||||
name = "pyflowx"
|
name = "pyflowx"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.8"
|
requires-python = ">=3.8"
|
||||||
version = "0.2.13"
|
version = "0.3.0"
|
||||||
|
|
||||||
[project.scripts]
|
[project.scripts]
|
||||||
autofmt = "pyflowx.cli.autofmt:main"
|
autofmt = "pyflowx.cli.autofmt:main"
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ from .task import (
|
|||||||
task_template,
|
task_template,
|
||||||
)
|
)
|
||||||
|
|
||||||
__version__ = "0.3.7"
|
__version__ = "0.4.0"
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
"IS_LINUX",
|
"IS_LINUX",
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
|
import getpass
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Literal, get_args
|
from typing import Literal, get_args
|
||||||
|
|
||||||
@@ -254,6 +255,31 @@ def main() -> None:
|
|||||||
allow_upstream_skip=True,
|
allow_upstream_skip=True,
|
||||||
verbose=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 环境变量
|
# 设置 Python 环境变量
|
||||||
*setenv_group({
|
*setenv_group({
|
||||||
"PIP_INDEX_URL": PIP_INDEX_URLS[python_mirror],
|
"PIP_INDEX_URL": PIP_INDEX_URLS[python_mirror],
|
||||||
|
|||||||
+24
-15
@@ -6,39 +6,48 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
import pyflowx as px
|
import pyflowx as px
|
||||||
from pyflowx.conditions import Constants
|
from pyflowx.conditions import Constants
|
||||||
|
|
||||||
|
# 项目根目录(pymake.py 在 src/pyflowx/cli,向上四层到达根目录)
|
||||||
|
ROOT_DIR = Path(__file__).parent.parent.parent.parent
|
||||||
|
|
||||||
MATURIN_BUILD_COMMAND = ["maturin", "build", "-r"]
|
MATURIN_BUILD_COMMAND = ["maturin", "build", "-r"]
|
||||||
if Constants.IS_WINDOWS:
|
if Constants.IS_WINDOWS:
|
||||||
MATURIN_BUILD_COMMAND.extend(["--target", "x86_64-win7-windows-msvc", "-Zbuild-std", "-i", "python3.8"])
|
MATURIN_BUILD_COMMAND.extend(["--target", "x86_64-win7-windows-msvc", "-Zbuild-std", "-i", "python3.8"])
|
||||||
|
|
||||||
# 扁平注册所有任务(px.cmd 自动从命令前两段推导 name)
|
# 扁平注册所有任务(px.cmd 自动从命令前两段推导 name)
|
||||||
|
# 所有任务指定 cwd=ROOT_DIR,确保在项目根目录执行
|
||||||
tasks: list[px.TaskSpec] = [
|
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(
|
px.cmd(
|
||||||
["pytest", "-m", "not slow", "-n", "8", "--dist", "loadfile", "--color=yes", "--durations=10"],
|
["pytest", "-m", "not slow", "-n", "8", "--dist", "loadfile", "--color=yes", "--durations=10"],
|
||||||
name="test",
|
name="test",
|
||||||
|
cwd=ROOT_DIR,
|
||||||
),
|
),
|
||||||
px.cmd(
|
px.cmd(
|
||||||
["pytest", "-m", "not slow", "--dist", "loadfile", "--color=yes", "--durations=10"],
|
["pytest", "-m", "not slow", "--dist", "loadfile", "--color=yes", "--durations=10"],
|
||||||
name="test_fast",
|
name="test_fast",
|
||||||
|
cwd=ROOT_DIR,
|
||||||
),
|
),
|
||||||
px.cmd(
|
px.cmd(
|
||||||
["pytest", "--cov", "-n", "8", "--dist", "loadfile", "--tb=short", "-v", "--color=yes", "--durations=10"],
|
["pytest", "--cov", "-n", "8", "--dist", "loadfile", "--tb=short", "-v", "--color=yes", "--durations=10"],
|
||||||
name="test_coverage",
|
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 自引用
|
# 单任务别名(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"],
|
"bump": ["c", "tc", "git_add_all", "bumpversion"],
|
||||||
"bumpmi": "bumpversion_minor",
|
"bumpmi": "bumpversion_minor",
|
||||||
"cov": ["git_clean", "test_coverage"],
|
"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"],
|
"pb": ["twine_publish", "publish_python"],
|
||||||
"t": "test",
|
"t": "test",
|
||||||
"tf": "test_fast",
|
"tf": "test_fast",
|
||||||
"tc": ["pyrefly_check", "lint"],
|
"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"],
|
"p": ["git_clean", "git_push", "git_push_tags"],
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
from unittest.mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
@@ -123,6 +124,22 @@ class TestTaskSpecDefinitions:
|
|||||||
assert spec.cmd == ["tox", "-p", "auto"]
|
assert spec.cmd == ["tox", "-p", "auto"]
|
||||||
assert spec.skip_if_missing is False
|
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
|
# main function
|
||||||
|
|||||||
+10
-3
@@ -531,16 +531,23 @@ class TestIntegrationWithRun:
|
|||||||
|
|
||||||
def test_profile_from_real_run(self) -> None:
|
def test_profile_from_real_run(self) -> None:
|
||||||
"""从真实 run() 结果构建剖面."""
|
"""从真实 run() 结果构建剖面."""
|
||||||
|
import time
|
||||||
|
|
||||||
|
def slow() -> int:
|
||||||
|
time.sleep(0.01) # 确保任务有实际耗时,避免 duration 极小导致并行度计算为 0
|
||||||
|
return 1
|
||||||
|
|
||||||
graph = px.Graph.from_specs([
|
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")
|
report = px.run(graph, strategy="sequential")
|
||||||
|
|
||||||
profile = ProfileReport.from_report(report, graph)
|
profile = ProfileReport.from_report(report, graph)
|
||||||
|
|
||||||
assert len(profile.tasks) == 3
|
assert len(profile.tasks) == 3
|
||||||
|
# sequential 策略下应为串行,duration > 0
|
||||||
assert profile.critical_path_duration > 0
|
assert profile.critical_path_duration > 0
|
||||||
# sequential 策略下并行度应为 1
|
# sequential 策略下并行度应为 1
|
||||||
assert profile.peak_parallelism == 1
|
assert profile.peak_parallelism == 1
|
||||||
|
|||||||
+2
-2
@@ -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:
|
def test_should_execute_skip_if_missing_cmd_found() -> None:
|
||||||
"""skip_if_missing 但命令存在时应执行."""
|
"""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({})
|
should_run, reason = spec.should_execute({})
|
||||||
assert should_run is True
|
assert should_run is True
|
||||||
assert reason is None
|
assert reason is None
|
||||||
|
|||||||
@@ -5603,7 +5603,7 @@ pycountry = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pyflowx"
|
name = "pyflowx"
|
||||||
version = "0.2.12"
|
version = "0.2.13"
|
||||||
source = { editable = "." }
|
source = { editable = "." }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "graphlib-backport", marker = "python_full_version < '3.9'" },
|
{ name = "graphlib-backport", marker = "python_full_version < '3.9'" },
|
||||||
|
|||||||
Reference in New Issue
Block a user