mirror of
				https://github.com/hiyouga/LLaMA-Factory.git
				synced 2025-11-04 18:02:19 +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
							
								
									a8caf09c7f
								
							
						
					
					
						commit
						1f0c52b73c
					
				
							
								
								
									
										7
									
								
								.github/workflows/publish.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.github/workflows/publish.yml
									
									
									
									
										vendored
									
									
								
							@ -28,14 +28,9 @@ jobs:
 | 
			
		||||
        with:
 | 
			
		||||
          python-version: "3.9"
 | 
			
		||||
 | 
			
		||||
      - name: Install dependencies
 | 
			
		||||
        run: |
 | 
			
		||||
          python -m pip install --upgrade pip
 | 
			
		||||
          python -m pip install build
 | 
			
		||||
 | 
			
		||||
      - name: Build package
 | 
			
		||||
        run: |
 | 
			
		||||
          python -m build
 | 
			
		||||
          make build
 | 
			
		||||
 | 
			
		||||
      - name: Publish package
 | 
			
		||||
        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: |
 | 
			
		||||
          make license
 | 
			
		||||
 | 
			
		||||
      - name: Check build
 | 
			
		||||
        run: |
 | 
			
		||||
          make build
 | 
			
		||||
 | 
			
		||||
      - name: Test with pytest
 | 
			
		||||
        run: |
 | 
			
		||||
          make test
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							@ -3,7 +3,7 @@
 | 
			
		||||
check_dirs := scripts src tests setup.py
 | 
			
		||||
 | 
			
		||||
build:
 | 
			
		||||
	pip install build && python -m build
 | 
			
		||||
	pip3 install build && python3 -m build
 | 
			
		||||
 | 
			
		||||
commit:
 | 
			
		||||
	pre-commit install
 | 
			
		||||
 | 
			
		||||
@ -61,7 +61,7 @@ known-third-party = [
 | 
			
		||||
    "peft",
 | 
			
		||||
    "torch",
 | 
			
		||||
    "transformers",
 | 
			
		||||
    "trl"
 | 
			
		||||
    "trl",
 | 
			
		||||
]
 | 
			
		||||
 | 
			
		||||
[tool.ruff.lint.pydocstyle]
 | 
			
		||||
@ -87,5 +87,9 @@ conflicts = [
 | 
			
		||||
    [
 | 
			
		||||
        { extra = "torch-npu" },
 | 
			
		||||
        { extra = "vllm" },
 | 
			
		||||
    ]
 | 
			
		||||
    ],
 | 
			
		||||
    [
 | 
			
		||||
        { extra = "sglang" },
 | 
			
		||||
        { extra = "minicpm_v" },
 | 
			
		||||
    ],
 | 
			
		||||
]
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user