From 11e539df6895529c1b3ffc851fdd93cc27a6297d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= <bgabor8@bloomberg.net>
Date: Tue, 17 Sep 2024 09:52:38 -0700
Subject: [PATCH] Use upstream setup-uv with uv python
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Bernát Gábor <bgabor8@bloomberg.net>
---
 .github/workflows/check.yml   | 54 ++++++++++++++++-------------------
 .github/workflows/release.yml | 18 ++++++------
 2 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 5e023057..3cd30856 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -33,25 +33,23 @@ jobs:
           - macos-latest
 
     steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Install the latest version of uv
         uses: astral-sh/setup-uv@v3
         with:
           enable-cache: true
+          cache-dependency-glob: "pyproject.toml"
           github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Setup python hatch
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
+      - name: Add .local/bin to Windows PATH
+        if: runner.os == 'Windows'
+        shell: bash
+        run: echo "$USERPROFILE/.local/bin" >> $GITHUB_PATH
       - name: install hatch
-        run: uv pip install --system --python 3.12 hatch
-      - name: Setup python for test ${{ matrix.py }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.py }}
-          allow-prereleases: true
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+        run: uv tool install --python-preference only-managed --python 3.13 hatch
+      - name: install Python
+        run: uv python install --python-preference only-managed ${{ matrix.py }}
       - name: Pick environment to run
         run: |
           import codecs; import os
@@ -92,20 +90,17 @@ jobs:
     steps:
       - name: Let us have colors
         run: echo "FORCE_COLOR=true" >> "$GITHUB_ENV"
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Install the latest version of uv
         uses: astral-sh/setup-uv@v3
         with:
           enable-cache: true
+          cache-dependency-glob: "pyproject.toml"
           github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Setup python hatch
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
       - name: install hatch
-        run: uv pip install --system --python 3.12 hatch
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+        run: uv tool install --python-preference only-managed --python 3.13 hatch
       - name: Setup coverage tool
         run: |
           hatch -v env create coverage
@@ -139,20 +134,21 @@ jobs:
           - { "name": "docs", "target": "build" }
           - { "name": "readme", "target": "run" }
     steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Install the latest version of uv
         uses: astral-sh/setup-uv@v3
         with:
           enable-cache: true
+          cache-dependency-glob: "pyproject.toml"
           github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Setup python hatch
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
+      - name: Add .local/bin to Windows PATH
+        if: runner.os == 'Windows'
+        shell: bash
+        run: echo "$USERPROFILE/.local/bin" >> $GITHUB_PATH
       - name: install hatch
-        run: uv pip install --system --python 3.12 hatch
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
+        run: uv tool install --python-preference only-managed --python 3.13 hatch
       - name: Setup ${{ matrix.env.name }}
         run: |
           hatch -v env create ${{ matrix.env.name }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5a1e8ede..298e1891 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,18 +12,18 @@ jobs:
     permissions:
       id-token: write
     steps:
-      - name: Setup python to build package
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-      - name: setup uv for tox
-        uses: yezz123/setup-uv@v4
-      - name: Install build
-        run: uv pip install build[uv] --system
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Install the latest version of uv
+        uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
+          cache-dependency-glob: "pyproject.toml"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build package
-        run: pyproject-build --installer uv --sdist --wheel . --outdir dist
+        run: uv build --python 3.13 --python-preference only-managed --sdist --wheel . --out-dir dist
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@v1.10.1
+        with:
+          attestations: true