From 08fa13317771a26f11b49c7df7dba915057cf2f2 Mon Sep 17 00:00:00 2001 From: Dan Saunders Date: Fri, 6 Dec 2024 10:19:54 -0500 Subject: [PATCH] Fix broken CLI; remove duplicate metadata from setup.py (#2136) * Fix broken CLI; remove duplicate metadata from setup.py * Adding tests.yml CLI check * updating * remove test with requests to github due to rate limiting --------- Co-authored-by: Dan Saunders --- .github/workflows/tests-nightly.yml | 4 ++++ .github/workflows/tests.yml | 8 ++++++++ pyproject.toml | 3 +++ setup.py | 6 ------ tests/cli/test_utils.py | 17 ----------------- 5 files changed, 15 insertions(+), 23 deletions(-) diff --git a/.github/workflows/tests-nightly.yml b/.github/workflows/tests-nightly.yml index f81f711de..8b7561bd1 100644 --- a/.github/workflows/tests-nightly.yml +++ b/.github/workflows/tests-nightly.yml @@ -58,6 +58,10 @@ jobs: python scripts/cutcrossentropy_install.py | sh pip3 install -r requirements-dev.txt -r requirements-tests.txt + - name: Ensure axolotl CLI was installed + run: | + axolotl --help + - name: Run tests run: | pytest -n8 --dist loadfile --ignore=tests/e2e/ --ignore=tests/patched/ tests/ diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 89f19ca9c..690047bb1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -77,6 +77,10 @@ jobs: python scripts/cutcrossentropy_install.py | sh pip3 install -r requirements-dev.txt -r requirements-tests.txt + - name: Ensure axolotl CLI was installed + run: | + axolotl --help + - name: Run tests run: | pytest -n8 --dist loadfile --ignore=tests/e2e/ --ignore=tests/patched/ tests/ @@ -122,6 +126,10 @@ jobs: pip3 install dist/axolotl*.tar.gz pip3 install -r requirements-dev.txt -r requirements-tests.txt + - name: Ensure axolotl CLI was installed + run: | + axolotl --help + - name: Run tests run: | pytest -n8 --dist loadfile --ignore=tests/e2e/ --ignore=tests/patched/ tests/ diff --git a/pyproject.toml b/pyproject.toml index 815e24327..6805e2e48 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,6 +9,9 @@ description = "LLM Trainer" readme = "README.md" requires-python = ">=3.10" +[project.scripts] +axolotl = "axolotl.cli.main:main" + [project.urls] Homepage = "https://axolotl-ai-cloud.github.io/axolotl/" Repository = "https://github.com/axolotl-ai-cloud/axolotl.git" diff --git a/setup.py b/setup.py index ac2fd9d42..8d7173f28 100644 --- a/setup.py +++ b/setup.py @@ -92,13 +92,7 @@ def parse_requirements(): install_requires, dependency_links = parse_requirements() - setup( - name="axolotl", - use_scm_version=True, - setup_requires=["setuptools_scm"], - description="LLM Trainer", - long_description="Axolotl is a tool designed to streamline the fine-tuning of various AI models, offering support for multiple configurations and architectures.", package_dir={"": "src"}, packages=find_packages("src"), install_requires=install_requires, diff --git a/tests/cli/test_utils.py b/tests/cli/test_utils.py index a593479a4..b88e4ac72 100644 --- a/tests/cli/test_utils.py +++ b/tests/cli/test_utils.py @@ -70,20 +70,3 @@ def test_fetch_from_github_network_error(): with patch("requests.get", side_effect=requests.RequestException): with pytest.raises(requests.RequestException): fetch_from_github("examples/", None) - - -@pytest.fixture -def integration_test_dir(tmp_path): - """Fixture for integration test directory that cleans up after itself""" - test_dir = tmp_path / "github_downloads" - test_dir.mkdir(parents=True) - yield test_dir - - -def test_fetch_from_github_real(integration_test_dir): - """Test actual GitHub API interaction""" - fetch_from_github("examples/", integration_test_dir) - - # Verify some known files exist - assert (integration_test_dir / "openllama-3b" / "lora.yml").exists() - assert (integration_test_dir / "openllama-3b" / "qlora.yml").exists()