Revert "switch to uv"

This reverts commit 2745240.

.github/workflows/new_tasks.yml

@@ -11,14 +11,14 @@ on:
 # comment/edit out the above to stop/change the triggers
 jobs:
   changed_files:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest  # windows-latest || macos-latest
     timeout-minutes: 120
     name: Scan for changed tasks
     steps:
-      - name: Checkout
+      - name: checkout
         uses: actions/checkout@v4
         with:
-          fetch-depth: 2
+          fetch-depth: 2  # OR "2" -> To retrieve the preceding commit.
 
       # Uses the tj-actions/changed-files action to check for changes.
       # Outputs provided here: https://github.com/tj-actions/changed-files#outputs
@@ -36,35 +36,37 @@ jobs:
               - lm_eval/api/**
           write_output_files: true
 
+    # The next step is optional; the files are written to the workspace by default (above).
+    # so it's just for debugging
       - name: Run Tests
         if: steps.changed-tasks.outputs.tasks_any_modified == 'true' || steps.changed-tasks.outputs.api_any_modified == 'true'
         run: |
           echo .github/outputs/tasks_all_changed_and_modified_files.txt >> 'GITHUB_ENV'
           echo "One or more test file(s) has changed."
           echo "List of all the files that have changed: ${{ steps.changed-tasks.outputs.tasks_all_modified_files }}"
 
-      - name: Install uv
+      - name: Set up Python 3.9
         if: steps.changed-tasks.outputs.tasks_any_modified == 'true' || steps.changed-tasks.outputs.api_any_modified == 'true'
-        uses: astral-sh/setup-uv@v5
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.9"
-          enable-cache: true
-          cache-dependency-glob: "setup.py"
-
+          python-version: 3.9
+          cache: 'pip'
+          cache-dependency-path: setup.py
       - name: Install dependencies
         if: steps.changed-tasks.outputs.tasks_any_modified == 'true' || steps.changed-tasks.outputs.api_any_modified == 'true'
-        env:
-          UV_SYSTEM_PYTHON: 1
         run: |
-          uv pip install -e '.[dev,ifeval]' --extra-index-url https://download.pytorch.org/whl/cpu
-
+            python -m pip install --upgrade pip
+            pip install -e '.[dev,ifeval]' --extra-index-url https://download.pytorch.org/whl/cpu
+    #   Install optional git dependencies
+    #       pip install bleurt@https://github.com/google-research/bleurt/archive/b610120347ef22b494b6d69b4316e303f5932516.zip#egg=bleurt
+    #       if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
       - name: Test with pytest
         # if new tasks are added, run tests on them
         if: steps.changed-tasks.outputs.tasks_any_modified == 'true'
-        run: uv run pytest tests/test_tasks.py -s -vv
+        run: python -m pytest tests/test_tasks.py -s -vv
         # if api is modified, run tests on it
       - name: Test more tasks with pytest
         env:
           API: true
         if: steps.changed-tasks.outputs.api_any_modified == 'true'
-        run: uv run pytest tests/test_tasks.py -s -vv
+        run: python -m pytest tests/test_tasks.py -s -vv

.github/workflows/unit_tests.yml

@@ -1,4 +1,8 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+# just comment out unwanted steps to turn off the test.
 name: Unit Tests
+
 on:
   push:
     branches:
@@ -7,39 +11,38 @@ on:
     branches:
       - 'main'
   workflow_dispatch:
-
+# Jobs run concurrently and steps run sequentially within a job.
+# jobs: linter and cpu_tests. Add more jobs/steps as required.
 jobs:
   linter:
     name: Linters
     runs-on: ubuntu-latest
     timeout-minutes: 5
+
     steps:
     - name: Checkout Code
       uses: actions/checkout@v4
     - name: Set up Python 3.9
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.9"
-    - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: actions/setup-python@v5
       with:
-        python-version: "latest"
-        enable-cache: true
-    - name: Install dependencies and run pre-commit
+        python-version: 3.9
+        cache: pip
+        cache-dependency-path: pyproject.toml
+    - name: Pre-Commit
       env:
         SKIP: "no-commit-to-branch,mypy"
-      run: |
-        uv pip install pre-commit --system
-        pre-commit run --all-files
 
+      uses: pre-commit/[email protected]
+#       # mypy turned off for now
+#    - name: Lint with mypy
+#      run: mypy . --ignore-missing-imports --check-untyped-defs --explicit-package-bases --warn-unreachable
+# Job 2
   testcpu:
     name: CPU Tests
     runs-on: ubuntu-latest
-    env:
-      UV_SYSTEM_PYTHON: 1
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12" ]
     timeout-minutes: 30
     steps:
     - name: Checkout Code
@@ -48,15 +51,15 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install uv
-      uses: astral-sh/setup-uv@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-        enable-cache: true
-        cache-dependency-glob: "**/pyproject.toml"
+        cache: pip
+        cache-dependency-path: pyproject.toml
     - name: Install dependencies
       run: |
-        uv pip install -e '.[dev,sentencepiece,api]' --extra-index-url https://download.pytorch.org/whl/cpu --system
+        python -m pip install --upgrade pip
+        pip install -e '.[dev,sentencepiece,api]' --extra-index-url https://download.pytorch.org/whl/cpu
+#         Install optional git dependencies
+#                pip install bleurt@https://github.com/google-research/bleurt/archive/b610120347ef22b494b6d69b4316e303f5932516.zip#egg=bleurt
+#        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
     - name: Test with pytest
       run: python -m pytest --showlocals -s -vv -n=auto --ignore=tests/models/test_neuralmagic.py --ignore=tests/models/test_openvino.py
     - name: Archive artifacts
@@ -65,29 +68,23 @@ jobs:
         name: output_testcpu${{ matrix.python-version }}
         path: |
           test_logs/*
-
   testmodels:
     name: External LM Tests
     runs-on: ubuntu-latest
     timeout-minutes: 30
-    env:
-      UV_SYSTEM_PYTHON: 1
     steps:
     - name: Checkout Code
       uses: actions/checkout@v4
     - name: Set up Python 3.9
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.9"
-    - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: actions/setup-python@v5
       with:
-        python-version: "3.9"
-        enable-cache: true
-        cache-dependency-glob: "**/pyproject.toml"
+        python-version: 3.9
+        cache: pip
+        cache-dependency-path: pyproject.toml
     - name: Install dependencies
       run: |
-        uv pip install -e '.[dev,optimum,deepsparse,sparseml,api]' --extra-index-url https://download.pytorch.org/whl/cpu --system
-        uv pip install -U transformers peft --system
+        python -m pip install --upgrade pip
+        pip install -e '.[dev,optimum,deepsparse,sparseml,api]' --extra-index-url https://download.pytorch.org/whl/cpu
+        pip install -U transformers peft
     - name: Test with pytest
       run: python -m pytest tests/models --showlocals -s -vv