Merge branch 'main' into cov

move-coop · Sep 6, 2024 · 0bc084a · 0bc084a
2 parents b5e00d4 + 9a61b7c
commit 0bc084a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -1,4 +1,4 @@
-name: Pytest and ruff
+name: Check coverage
 
 on:
   pull_request:
@@ -38,7 +38,7 @@ jobs:
           cache: pip
       - name: Install uv
         run: |
-          pip install -U pip uv
+          pip install uv
       - name: Install dependencies
         run: |
           uv pip install --system -e .[all]

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ on:
 env:
   TESTING: 1
 
-permissions:  # added using https://github.com/step-security/secure-repo
+permissions: # added using https://github.com/step-security/secure-repo
   contents: read
 
 jobs:
@@ -63,7 +63,7 @@ jobs:
           cache: pip
       - name: Install uv
         run: |
-          pip install -U pip uv
+          pip install uv
       - name: Install dependencies
         env:
           PARSONS_LIMITED_DEPENDENCIES: ${{ matrix.limited-dependencies }}
@@ -72,9 +72,9 @@ jobs:
           uv pip install --system -r requirements-dev.txt
       - name: Lint
         run: |
-          ruff check parsons/ test/ useful_resources/
+          ruff check --output-format=github parsons/ test/ useful_resources/
       - name: Tests
-        run: pytest -rf test/
+        run: pytest -rf
       - name: Format
         run: |
           ruff format --check --diff parsons/ test/ useful_resources/