From 81c7bc03eaeb11736c6e287a3641ef71705f7ade Mon Sep 17 00:00:00 2001
From: Barret Schloerke <barret@posit.co>
Date: Tue, 29 Oct 2024 01:02:03 -0400
Subject: [PATCH] Do not use uv system envvar; Use uv to install python

---
 .github/workflows/ci.yaml       | 14 +++++++-------
 .github/workflows/coverage.yaml |  5 ++---
 .github/workflows/release.yaml  |  5 ++---
 .github/workflows/site.yaml     |  9 ++++-----
 Dockerfile                      |  2 --
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index baa27e5f..7753975c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -4,14 +4,14 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
-env:
-  UV_SYSTEM_PYTHON: true
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: astral-sh/setup-uv@v3
+      - run: uv python install
+      - run: make dev
       - run: make lint
       - run: make fmt
 
@@ -27,9 +27,8 @@ jobs:
           - "3.12"
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
+      - uses: astral-sh/setup-uv@v3
+      - run: uv python install ${{ matrix.python-version }}
       - run: make dev
       - run: make test
 
@@ -94,6 +93,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: astral-sh/setup-uv@v3
+      - run: uv python install
       - run: make dev
       - run: make build
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
index b57e3818..bdd492f2 100644
--- a/.github/workflows/coverage.yaml
+++ b/.github/workflows/coverage.yaml
@@ -4,14 +4,13 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
-env:
-  UV_SYSTEM_PYTHON: true
 jobs:
   cov:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: astral-sh/setup-uv@v3
+      - run: uv python install
       - run: make dev
       - run: make test
       - run: make cov-xml
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index e9edabf1..f641a1af 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -3,8 +3,6 @@ on:
   push:
     tags:
       - "v*.*.*"
-env:
-  UV_SYSTEM_PYTHON: true
 jobs:
   default:
     runs-on: ubuntu-latest
@@ -14,7 +12,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v5
+      - uses: astral-sh/setup-uv@v3
+      - run: uv python install
       - uses: actions/setup-node@v4
       - run: make build
       - run: make install
diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml
index 3abb7b52..c736da7a 100644
--- a/.github/workflows/site.yaml
+++ b/.github/workflows/site.yaml
@@ -6,9 +6,6 @@ on:
       - "v*.*.*"
   pull_request:
 
-env:
-  UV_SYSTEM_PYTHON: true
-
 permissions:
   id-token: write
   pages: write
@@ -25,7 +22,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v5
+      - uses: astral-sh/setup-uv@v3
+      - run: uv python install
       - run: make deps
       - run: make build
       - run: make install
@@ -44,7 +42,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v5
+      - uses: astral-sh/setup-uv@v3
+      - run: uv python install
       - uses: actions/setup-node@v4
       - uses: quarto-dev/quarto-actions/setup@v2
       - run: make deps
diff --git a/Dockerfile b/Dockerfile
index c9d0c88e..9dc985fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,5 @@
 FROM python:3
 
-ENV UV_SYSTEM_PYTHON=true
-
 RUN apt-get update && apt-get install -y make
 
 WORKDIR /sdk