Merge pull request #156 from spraakbanken/use-uv

use uv
spraakbanken · Oct 16, 2024 · 251a386 · 251a386
2 parents 229060d + 5ffe1e4
commit 251a386
Show file tree

Hide file tree

Showing 56 changed files with 2,068 additions and 2,188 deletions.
diff --git a/.github/DOCS.md b/.github/DOCS.md
@@ -2,25 +2,25 @@
 
 In this folder there is configuration for codecoverage, dependabot and ci workflows.
 
-This folder can be merged using a `--allow-unrelated-histories` merge strategy from <https://github.com/spraakbanken/python-pdm-ci-conf> which provides a reasonably sensible base for writing your own ci on. By using this strategy the history of the CI repo is included in your repo, and future updates to the CI can be merged later.
+This folder can be merged using a `--allow-unrelated-histories` merge strategy from <https://github.com/spraakbanken/python-uv-ci-conf> which provides a reasonably sensible base for writing your own ci on. By using this strategy the history of the CI repo is included in your repo, and future updates to the CI can be merged later.
 
 The workflows in this folder requires a root Makefile with a couple of targets defined.
-As base can the Makefile in <https://github.com/spraakbanken/python-pdm-make-conf> be used.
+As base can the Makefile in <https://github.com/spraakbanken/python-uv-make-conf> be used.
 
 ## Publish
 
-The `publish`-step in [test.yml](./workflows/test.yml) is configured to use the GitHub environment `release`, create that or change to your preferred environment.
+The `publish`-step in [release.yml](./workflows/release.yml) is configured to use the GitHub environment `release`, create that or change to your preferred environment.
 To publish to PyPI you must also configure your Pypi-project settings to use Trusted Publisher Management, by setting repo, workflow and environment on PyPI.
 
 To perform this merge run:
 
 ```shell
-git remote add ci [email protected]:spraakbanken/python-pdm-ci-conf.git
+git remote add ci [email protected]:spraakbanken/python-uv-ci-conf.git
 git fetch ci
 git merge --allow-unrelated-histories ci/main
 ```
 
-or add the remote as `git remote add ci https://github.com/spraakbanken/python-pdm-ci-conf.git`
+or add the remote as `git remote add ci https://github.com/spraakbanken/python-uv-ci-conf.git`
 
 To later merge updates to this repo, just run:
 

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -12,6 +12,8 @@ permissions:
 
 env:
   MINIMUM_PYTHON_VERSION: "3.10"
+  UV_VERSION: "0.4.18"
+  UV_CACHE_DIR: /tmp/.uv-cache
 
 # If new code is pushed to a PR branch, then cancel in progress workflows for that PR. Ensures that
 # we don't waste CI time, and returns results quicker https://github.com/jonhoo/rust-ci-conf/pull/5
@@ -29,24 +31,42 @@ jobs:
           submodules: true
 
       - name: Set up the python ${{ env.MINIMUM_PYTHON_VERSION }}
-        uses: pdm-project/setup-pdm@v4
+        uses: actions/setup-python@v5
         id: setup-python
         with:
           python-version: ${{ env.MINIMUM_PYTHON_VERSION }}
-
+
+      #----------------------------------------------
+      #  -----  setup uv and load cache   -----
+      #----------------------------------------------
+      - name: Set up uv
+        run: curl -LsSf https://astral.sh/uv/${{ env.UV_VERSION }}/install.sh | sh
+
+      - name: Restore uv cache
+        uses: actions/cache@v4
+        with:
+          path: /tmp/.uv-cache
+          key: uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
+          restore-keys: |
+            uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
+            uv-${{ runner.os }}
+
       - name: Load cached venv
         id: cached-venv
         uses: actions/cache@v4
         with:
           path: .venv
-          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/pyproject.toml') }}-${{ hashFiles('**/pdm.lock') }}-${{ hashFiles('.github/workflows/check.yml') }}
-    
+          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/pyproject.toml') }}-${{ hashFiles('**/uv.lock') }}
+
       - name: Install dependencies
         if: steps.cached-venv.outputs.cache-hit != 'true'
         run: make install-dev
-      
+
       - name: check formatting
         run: make check-fmt
+
+      - name: Minimize uv cache
+        run: uv cache prune --ci
   lint:
     runs-on: ubuntu-latest
     name: ubuntu / 3.10 / lint
@@ -55,21 +75,41 @@ jobs:
         with:
           submodules: true
       - name: Set up the python ${{ env.MINIMUM_PYTHON_VERSION }}
-        uses: pdm-project/setup-pdm@v4
+        uses: actions/setup-python@v5
         id: setup-python
         with:
           python-version: ${{ env.MINIMUM_PYTHON_VERSION }}
+
+      #----------------------------------------------
+      #  -----  setup uv and load cache   -----
+      #----------------------------------------------
+      - name: Set up uv
+        run: curl -LsSf https://astral.sh/uv/${{ env.UV_VERSION }}/install.sh | sh
+
+      - name: Restore uv cache
+        uses: actions/cache@v4
+        with:
+          path: /tmp/.uv-cache
+          key: uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
+          restore-keys: |
+            uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
+            uv-${{ runner.os }}
+
       - name: Load cached venv
         id: cached-venv
         uses: actions/cache@v4
         with:
           path: .venv
-          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/pyproject.toml') }}-${{ hashFiles('**/pdm.lock') }}-${{ hashFiles('.github/workflows/check.yml') }}
+          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/pyproject.toml') }}-${{ hashFiles('**/uv.lock') }}
       - name: Install dependencies
         if: steps.cached-venv.outputs.cache-hit != 'true'
         run: make install-dev
       - name: lint code
         run: make lint
+
+      - name: Minimize uv cache
+        run: uv cache prune --ci
+
   type-check:
     runs-on: ubuntu-latest
     name: ubuntu / 3.10 / type-check
@@ -78,26 +118,45 @@ jobs:
         with:
           submodules: true
       - name: Set up the python ${{ env.MINIMUM_PYTHON_VERSION }}
-        uses: pdm-project/setup-pdm@v4
+        uses: actions/setup-python@v5
         id: setup-python
         with:
           python-version: ${{ env.MINIMUM_PYTHON_VERSION }}
+
+      #----------------------------------------------
+      #  -----  setup uv and load cache   -----
+      #----------------------------------------------
+      - name: Set up uv
+        run: curl -LsSf https://astral.sh/uv/${{ env.UV_VERSION }}/install.sh | sh
+
+      - name: Restore uv cache
+        uses: actions/cache@v4
+        with:
+          path: /tmp/.uv-cache
+          key: uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
+          restore-keys: |
+            uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
+            uv-${{ runner.os }}
+
       - name: Load cached venv
         id: cached-venv
         uses: actions/cache@v4
         with:
           path: .venv
-          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/pyproject.toml') }}-${{ hashFiles('**/pdm.lock') }}-${{ hashFiles('.github/workflows/check.yml') }}
+          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/pyproject.toml') }}-${{ hashFiles('**/uv.lock') }}
       - name: Install dependencies
         if: steps.cached-venv.outputs.cache-hit != 'true'
         run: make install-dev
       - name: type-check code
         run: make type-check
 
+      - name: Minimize uv cache
+        run: uv cache prune --ci
+
   # https://github.com/marketplace/actions/alls-green#why used for branch protection checks
   check-check:
     if: always()
-    needs: 
+    needs:
       - fmt
       - lint
       - type-check

diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
@@ -9,16 +9,52 @@ on:
     branches: [main]
   pull_request:
   schedule:
-    - cron:  '7 7 * * *'
+    - cron: "7 7 * * *"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 name: rolling
 
+env:
+  UV_VERSION: "0.4.18"
+  UV_CACHE_DIR: /tmp/.uv-cache
+
 jobs:
+  # https://twitter.com/mycoliza/status/1571295690063753218
+  nightly:
+    runs-on: ubuntu-latest
+    name: ubuntu / 3.14-dev
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Set up uv
+        run: curl -LsSf https://astral.sh/uv/${{ env.UV_VERSION }}/install.sh | sh
+      - name: Install python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.14-dev"
+      - name: Restore uv cache
+        uses: actions/cache@v4
+        with:
+          path: /tmp/.uv-cache
+          key: uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
+          restore-keys: |
+            uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
+            uv-${{ runner.os }}
+      - run: python --version
+      - name: uv lock
+        if: hashFiles('uv.lock') == ''
+        run: uv lock
+      - name: uv sync --dev
+        run: uv sync --dev
+      - name: make test
+        run: make test
 
+      - name: Minimize uv cache
+        run: uv cache prune --ci
   # https://twitter.com/alcuadrado/status/1571291687837732873
   update:
     # This action checks that updating the dependencies of this crate to the latest available that
@@ -35,17 +71,31 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
+      - name: Set up uv
+        if: hashFiles('uv.lock') != ''
+        run: curl -LsSf https://astral.sh/uv/${{ env.UV_VERSION }}/install.sh | sh
       - name: Install 3.12
-        if: hashFiles('pdm.lock') != ''
-        uses: pdm-project/setup-pdm@v4
+        if: hashFiles('uv.lock') != ''
+        uses: actions/setup-python@v5
         with:
           python-version: "3.12"
-      - name: pdm update
-        if: hashFiles('pdm.lock') != ''
-        run: pdm update
-      - name: pdm sync --dev
-        if: hashFiles('pdm.lock') != ''
-        run: pdm sync --dev
+
+      - name: Restore uv cache
+        uses: actions/cache@v4
+        with:
+          path: /tmp/.uv-cache
+          key: uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
+          restore-keys: |
+            uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
+            uv-${{ runner.os }}
+
+      - name: uv sync --dev --upgrade
+        if: hashFiles('uv.lock') != ''
+        run: uv sync --dev --upgrade
       - name: make test
-        if: hashFiles('pdm.lock') != ''
+        if: hashFiles('uv.lock') != ''
         run: make test
+
+      - name: Minimize uv cache
+        if: hashFiles('uv.lock') != ''
+        run: uv cache prune --ci