align with uv documentation

cvxgrp · Nov 30, 2024 · 41bf352 · 41bf352
1 parent 8fcaef8
commit 41bf352
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 63 deletions.
diff --git a/actions/setup-environment-uv/action.yml b/actions/setup-environment-uv/action.yml
diff --git a/actions/uv/coverage/action.yml b/actions/uv/coverage/action.yml
@@ -32,13 +32,13 @@ runs:
       - name: Test on Linux
         shell: bash
         run: |
-            pip install --no-cache-dir \
+            uv pip install --no-cache-dir \
                        pytest \
                        pytest-cov \
                        pytest-html \
                        pytest-random-order
 
-            pytest --cov=${{ inputs.source-folder || 'cvx' }} --random-order --verbose \
+            uv run pytest --cov=${{ inputs.source-folder || 'cvx' }} --random-order --verbose \
                               --html=artifacts/tests/html-report/report.html \
                               --cov-report term \
                               --cov-report xml:artifacts/tests/coverage/coverage.xml \

diff --git a/actions/uv/deptry/action.yml b/actions/uv/deptry/action.yml
@@ -32,9 +32,9 @@ runs:
       - name: Install deptry
         shell: bash
         run: |
-            pip install --no-cache-dir deptry
+            uv pip install --no-cache-dir deptry
 
       - name: Run deptry
         shell: bash
         run : |
-            deptry ${{ inputs.source-folder || 'cvx' }}
+            uv run deptry ${{ inputs.source-folder || 'cvx' }}
diff --git a/actions/uv/marimo/action.yml b/actions/uv/marimo/action.yml
@@ -33,7 +33,7 @@ runs:
       - name: Install marimo
         shell: bash
         run: |
-          pip install marimo
+          uv pip install marimo
 
 
       - name: Convert *.py files in book/marimo folder to html files
@@ -56,8 +56,8 @@ runs:
 
               # Convert to HTML
               echo "Converting $file to HTML..."
-              marimo export html "$file" -o "artifacts/marimo/${filename}.html"
-              marimo export md "$file" -o "artifacts/marimo/${filename}.md"
+              uv run marimo export html "$file" -o "artifacts/marimo/${filename}.html"
+              uv run marimo export md "$file" -o "artifacts/marimo/${filename}.md"
           done
 
       - name: Archive marimo html

diff --git a/actions/uv/setup/action.yml b/actions/uv/setup/action.yml
@@ -27,18 +27,19 @@ on:
 runs:
   using: "composite"
   steps:
-    - name: Setup Python
-      uses: actions/setup-python@v5
+    - name: Install uv
+      uses: astral-sh/setup-uv@v4
       with:
-        python-version: ${{ inputs.python-version || '3.12' }}
+        version: "0.5.5"
+        #enable-cache: 'true'
+        #cache-local-path: '/tmp/cache'
+        #cache-dependency-glob: 'uv.lock'
 
-    - name: Install UV
+    - name: Set up Python
       shell: bash
-      run: |
-        pip install uv
+      run: uv python install ${{ inputs.python-version || '3.12' }}
 
-    - name: Install Dependencies
+    - name: Install the project
       shell: bash
       run: |
-        uv pip install -r requirements.txt --system
-        uv pip install -e . --system
+        uv sync --all-extras --dev
diff --git a/actions/uv/sphinx/action.yml b/actions/uv/sphinx/action.yml
@@ -33,15 +33,15 @@ runs:
       - name: Install sphinx
         shell: bash
         run: |
-          pip install --no-cache-dir \
+          uv pip install --no-cache-dir \
                      sphinx==7.2.6 \
                      sphinx-autoapi \
                      sphinx-rtd-theme
 
       - name: Build sphinx
         shell: bash
         run: |
-          sphinx-build -b html ${{ inputs.sphinx-folder || 'book/sphinx' }} artifacts/sphinx
+          uv run sphinx-build -b html ${{ inputs.sphinx-folder || 'book/sphinx' }} artifacts/sphinx
 
       - name: Archive sphinx documentation
         uses: actions/upload-artifact@v4

diff --git a/actions/uv/test/action.yml b/actions/uv/test/action.yml
@@ -36,4 +36,5 @@ runs:
       - name: Test
         shell: bash
         run: |
-            pytest tests
+            uv pip install pytest
+            uv run pytest tests