From 81dc87fde1f5c38f3402645db2079c286995801a Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Wed, 29 Jan 2025 19:36:00 -0500 Subject: [PATCH] Use uv instead of flit in CI --- .github/workflows/build.yaml | 21 +++++++-------------- .github/workflows/rust.yaml | 15 ++++----------- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 624737bdc..8a3733836 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -30,20 +30,13 @@ jobs: - name: Install all TypeScript tools run: deno install brili.ts ; deno install brilck.ts ; deno install --allow-env --allow-read ts2bril.ts - - name: Install Flit - run: pip install flit + - name: Install uv + uses: astral-sh/setup-uv@v5 - name: Install Python tools - run: cd bril-txt ; flit install --symlink + run: cd bril-txt ; uv tool install . - name: Install Turnt - # run: pip install turnt # Use instead if pip turnt version >= 1.7 - uses: actions/checkout@v4 - with: - repository: cucapra/turnt - path: './turnt' - - name: Install Turnt part 2 - run: cd turnt ; flit install --symlink - + run: uv tool install turnt - name: Problem matcher run: echo '::add-matcher::.github/tap-matcher.json' @@ -68,10 +61,10 @@ jobs: - name: Install brilck run: deno install brilck.ts - - name: Install Flit - run: pip install flit + - name: Install uv + uses: astral-sh/setup-uv@v5 - name: Install Python tools - run: cd bril-txt ; flit install --symlink + run: cd bril-txt ; uv tool install . - name: Problem matcher run: echo '::add-matcher::.github/brilck-matcher.json' diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index 6a1951d3a..cda3e0703 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -69,20 +69,13 @@ jobs: cache: pip cache-dependency-path: bril-txt/pyproject.toml - - name: Install Flit - run: pip install flit + - name: Install uv + uses: astral-sh/setup-uv@v5 - name: Install Python tools - run: cd bril-txt ; flit install --symlink + run: cd bril-txt ; uv tool install . - name: Install Turnt - # run: pip install turnt # Use instead if pip turnt version >= 1.7 - uses: actions/checkout@v4 - with: - repository: cucapra/turnt - path: './turnt' - - name: Install Turnt part 2 - run: flit install --symlink - working-directory: ./turnt + run: uv tool install turnt - name: Problem matcher run: echo '::add-matcher::.github/tap-matcher.json'