diff --git a/.github/workflows/actionlint.yml b/.github/workflows/actionlint.yml index 1161a6e..758bcd4 100644 --- a/.github/workflows/actionlint.yml +++ b/.github/workflows/actionlint.yml @@ -19,14 +19,16 @@ name: Lint GitHub Actions workflows on: push: branches: - - "main" + - 'main' + - '*-dev' paths: - '.github/workflows/*.ya?ml' - '.github/workflows/actionlint.*' - '.github/workflows/matchers/actionlint.json' pull_request: branches: - - "main" + - 'main' + - '*-dev' paths: - '.github/workflows/*.ya?ml' - '.github/workflows/actionlint.*' diff --git a/.github/workflows/mypy.yaml b/.github/workflows/mypy.yaml index b23178b..e8a07f9 100644 --- a/.github/workflows/mypy.yaml +++ b/.github/workflows/mypy.yaml @@ -22,7 +22,8 @@ on: # but only for the main branch push: branches: - - "main" + - 'main' + - '*-dev' paths: - '**/*.py' - '.github/workflows/mypy.yaml' @@ -30,7 +31,8 @@ on: - 'mypy.ini' pull_request: branches: - - "main" + - 'main' + - '*-dev' # This workflow is only relevant when one of the following files changes. # However, we have github configured to expect and require this workflow # to run and pass before github with auto-merge a pull request. Until github diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml index 11573a8..91f9ba3 100644 --- a/.github/workflows/ruff.yml +++ b/.github/workflows/ruff.yml @@ -22,7 +22,8 @@ on: # but only for the main branch push: branches: - - "main" + - 'main' + - '*-dev' paths: - "**/*.py" - requirements-lint.txt @@ -30,7 +31,8 @@ on: - .github/workflows/ruff.yml pull_request: branches: - - "main" + - 'main' + - '*-dev' jobs: ruff: diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 6a8ff7a..43983b0 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -19,13 +19,15 @@ name: Lint shell scripts on: push: branches: - - "main" + - 'main' + - '*-dev' paths: - '**/*.sh' - '.github/workflows/shellcheck.yml' pull_request: branches: - - "main" + - 'main' + - '*-dev' paths: - '**/*.sh' - '.github/workflows/shellcheck.yml' diff --git a/.github/workflows/vllm_ascend_test.yaml b/.github/workflows/vllm_ascend_test.yaml index 5d882a5..b39a931 100644 --- a/.github/workflows/vllm_ascend_test.yaml +++ b/.github/workflows/vllm_ascend_test.yaml @@ -20,7 +20,8 @@ name: 'e2e test' on: push: branches: - - "main" + - 'main' + - '*-dev' paths: - '*.txt' - '**/*.py' @@ -28,7 +29,8 @@ on: - '!docs/**' pull_request: branches: - - "main" + - 'main' + - '*-dev' paths: - '*.txt' - '**/*.py' @@ -100,6 +102,16 @@ jobs: run: | pip install -e . + - name: Install torch-npu + run: | + mkdir pta + cd pta + wget https://pytorch-package.obs.cn-north-4.myhuaweicloud.com/pta/Daily/v2.5.1/20250218.4/pytorch_v2.5.1_py310.tar.gz + tar -xvf pytorch_v2.5.1_py310.tar.gz + pip install ./torch_npu-2.5.1.dev20250218-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + cd .. + rm -rf pta + - name: Run vllm-project/vllm-ascend test run: | pytest -sv tests diff --git a/.github/workflows/yapf.yml b/.github/workflows/yapf.yml index 0f980d9..66ee6b3 100644 --- a/.github/workflows/yapf.yml +++ b/.github/workflows/yapf.yml @@ -22,13 +22,15 @@ on: # but only for the main branch push: branches: - - "main" + - 'main' + - '*-dev' paths: - "**/*.py" - .github/workflows/yapf.yml pull_request: branches: - - "main" + - 'main' + - '*-dev' paths: - "**/*.py" - .github/workflows/yapf.yml diff --git a/packages.txt b/packages.txt index c649011..84955cd 100644 --- a/packages.txt +++ b/packages.txt @@ -1,3 +1,3 @@ git vim - +wget diff --git a/pytest.ini b/pytest.ini index 5c31aeb..deccf10 100644 --- a/pytest.ini +++ b/pytest.ini @@ -7,7 +7,7 @@ norecursedirs = vllm-empty/tests/kernels vllm-empty/tests/quantization vllm-empty/tests/tool_use - vllm-empty/tests/runai_model_streamer + vllm-empty/tests/runai_model_streamer_test vllm-empty/tests/kv_transfer vllm-empty/tests/plugins vllm-empty/tests/plugins_tests diff --git a/requirements-dev.txt b/requirements-dev.txt index 834cd0a..9c81094 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,4 +2,3 @@ modelscope pytest >= 6.0 pytest-asyncio - diff --git a/requirements.txt b/requirements.txt index c4cf016..3aaa410 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,3 @@ pyyaml scipy setuptools setuptools-scm -torch-npu >= 2.5.1rc1