mirror of
https://github.com/hiyouga/LLaMA-Factory.git
synced 2025-07-31 10:42:50 +08:00
[deps] fix uv conflicts (#7686)
* fix #7678 * Update setup.py * Update tests.yml * Update publish.yml * Update Makefile
This commit is contained in:
parent
11bcafd06a
commit
60a84f664b
7
.github/workflows/publish.yml
vendored
7
.github/workflows/publish.yml
vendored
@ -28,14 +28,9 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
python-version: "3.9"
|
python-version: "3.9"
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
python -m pip install build
|
|
||||||
|
|
||||||
- name: Build package
|
- name: Build package
|
||||||
run: |
|
run: |
|
||||||
python -m build
|
make build
|
||||||
|
|
||||||
- name: Publish package
|
- name: Publish package
|
||||||
uses: pypa/gh-action-pypi-publish@release/v1
|
uses: pypa/gh-action-pypi-publish@release/v1
|
||||||
|
4
.github/workflows/tests.yml
vendored
4
.github/workflows/tests.yml
vendored
@ -73,6 +73,10 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
make license
|
make license
|
||||||
|
|
||||||
|
- name: Check build
|
||||||
|
run: |
|
||||||
|
make build
|
||||||
|
|
||||||
- name: Test with pytest
|
- name: Test with pytest
|
||||||
run: |
|
run: |
|
||||||
make test
|
make test
|
||||||
|
2
Makefile
2
Makefile
@ -3,7 +3,7 @@
|
|||||||
check_dirs := scripts src tests setup.py
|
check_dirs := scripts src tests setup.py
|
||||||
|
|
||||||
build:
|
build:
|
||||||
pip install build && python -m build
|
pip3 install build && python3 -m build
|
||||||
|
|
||||||
commit:
|
commit:
|
||||||
pre-commit install
|
pre-commit install
|
||||||
|
@ -61,7 +61,7 @@ known-third-party = [
|
|||||||
"peft",
|
"peft",
|
||||||
"torch",
|
"torch",
|
||||||
"transformers",
|
"transformers",
|
||||||
"trl"
|
"trl",
|
||||||
]
|
]
|
||||||
|
|
||||||
[tool.ruff.lint.pydocstyle]
|
[tool.ruff.lint.pydocstyle]
|
||||||
@ -87,5 +87,9 @@ conflicts = [
|
|||||||
[
|
[
|
||||||
{ extra = "torch-npu" },
|
{ extra = "torch-npu" },
|
||||||
{ extra = "vllm" },
|
{ extra = "vllm" },
|
||||||
]
|
],
|
||||||
|
[
|
||||||
|
{ extra = "sglang" },
|
||||||
|
{ extra = "minicpm_v" },
|
||||||
|
],
|
||||||
]
|
]
|
||||||
|
2
setup.py
2
setup.py
@ -74,7 +74,7 @@ extra_require = {
|
|||||||
"modelscope": ["modelscope"],
|
"modelscope": ["modelscope"],
|
||||||
"openmind": ["openmind"],
|
"openmind": ["openmind"],
|
||||||
"swanlab": ["swanlab"],
|
"swanlab": ["swanlab"],
|
||||||
"dev": ["pre-commit", "ruff", "pytest"],
|
"dev": ["pre-commit", "ruff", "pytest", "build"],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user