From 08c8bb955f7c49cef2f627ca9b840e2c941cd668 Mon Sep 17 00:00:00 2001
From: suyiiyii <suyiiyii@gmail.com>
Date: Sun, 22 Dec 2024 21:15:32 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20=E5=B0=86=E6=89=80=E6=9C=89=20poetr?=
 =?UTF-8?q?y=20=E6=9B=BF=E6=8D=A2=E4=B8=BA=20uv?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/actions/setup-python/action.yml |  8 ++++++++
 .github/workflows/main.yml              | 16 ++++++----------
 .github/workflows/pyd1-compat.yml       |  8 ++++----
 .github/workflows/release-trigger.yml   |  4 ++--
 .github/workflows/release.yml           |  2 +-
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/.github/actions/setup-python/action.yml b/.github/actions/setup-python/action.yml
index 393f2bb..4b84088 100644
--- a/.github/actions/setup-python/action.yml
+++ b/.github/actions/setup-python/action.yml
@@ -6,6 +6,10 @@ inputs:
     description: Python version
     required: false
     default: "3.10"
+  install-deps:
+    description: Install dependencies
+    required: false
+    default: false
 
 runs:
   using: "composite"
@@ -20,3 +24,7 @@ runs:
       with:
         version: "latest"
         enable-cache: true
+
+    - name: Install dependencies
+      if: ${{ inputs.install-deps == true }}
+      run: uv sync --frozen
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8a2ecb0..3bc6ac1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ on:
       - nonebot_bison/**
       - tests/**
       - pyproject.toml
-      - poetry.lock
+      - uv.lock
       - docker.env.prod
       - .github/**
   pull_request:
@@ -21,7 +21,7 @@ on:
       - nonebot_bison/**
       - tests/**
       - pyproject.toml
-      - poetry.lock
+      - uv.lock
       - docker.env.prod
       - .github/**
     types:
@@ -72,12 +72,10 @@ jobs:
         uses: ./.github/actions/setup-python
         with:
           python-version: ${{ matrix.python-version }}
-
-      - name: Install prerequisites
-        run: poetry install
+          install-deps: "true"
 
       - name: Run Pytest
-        run: poetry run pytest --cov-report xml --cov=./nonebot_bison -k 'not compare and not render' -n auto
+        run: uv run pytest --cov-report xml --cov=./nonebot_bison -k 'not compare and not render' -n auto
 
       - name: Upload coverage report
         uses: codecov/codecov-action@v5
@@ -106,12 +104,10 @@ jobs:
         uses: ./.github/actions/setup-python
         with:
           python-version: ${{ matrix.python-version }}
-
-      - name: Install prerequisites
-        run: poetry install
+          install-deps: true
 
       - name: Run Pytest
-        run: poetry run pytest --cov-report xml --cov=./nonebot_bison -k 'not compare' -n auto
+        run: uv run pytest --cov-report xml --cov=./nonebot_bison -k 'not compare' -n auto
 
       - name: Upload coverage report
         uses: codecov/codecov-action@v5
diff --git a/.github/workflows/pyd1-compat.yml b/.github/workflows/pyd1-compat.yml
index a978101..4f9dc07 100644
--- a/.github/workflows/pyd1-compat.yml
+++ b/.github/workflows/pyd1-compat.yml
@@ -11,7 +11,7 @@ on:
       - nonebot_bison/**
       - tests/**
       - pyproject.toml
-      - poetry.lock
+      - uv.lock
       - docker.env.prod
       - .github/**
   pull_request:
@@ -21,7 +21,7 @@ on:
       - nonebot_bison/**
       - tests/**
       - pyproject.toml
-      - poetry.lock
+      - uv.lock
       - docker.env.prod
       - .github/**
     types:
@@ -55,7 +55,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install prerequisites
-        run: poetry add pydantic@^1.10 && poetry install
+        run: uv add pydantic==1.10 && uv sync --frozen
 
       - name: Run Pytest
-        run: poetry run pytest -k 'not compare and not render' -n auto
+        run: uv run pytest -k 'not compare and not render' -n auto
diff --git a/.github/workflows/release-trigger.yml b/.github/workflows/release-trigger.yml
index be95eff..69641b3 100644
--- a/.github/workflows/release-trigger.yml
+++ b/.github/workflows/release-trigger.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup Python environment
         uses: ./.github/actions/setup-python
 
-      - run: echo "TAG_NAME=v$(poetry version -s)" >> $GITHUB_ENV
+      - run: echo "TAG_NAME=v$(uvx --from=toml-cli toml get --toml-path=pyproject.toml project.version)" >> $GITHUB_ENV
 
       - name: Archive Changelog
         uses: docker://ghcr.io/nonebot/auto-changelog:master
@@ -30,6 +30,6 @@ jobs:
           git config user.name github-actions[bot]
           git config user.email github-actions[bot]@users.noreply.github.com
           git add .
-          git commit -m ":bookmark: Release $(poetry version -s)"
+          git commit -m ":bookmark: Release ${{ env.TAG_NAME }}"
           git tag ${{ env.TAG_NAME }}
           git push && git push --tags
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4f09c8c..2a2ef65 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -54,7 +54,7 @@ jobs:
 
       - name: Publish PyPI and Github
         run: |
-          poetry publish --build -u ${{ secrets.PYPI_USERNAME }} -p ${{ secrets.PYPI_PASSWORD }} || echo "Already pushed to pypi"
+          uv publish --build -u ${{ secrets.PYPI_USERNAME }} -p ${{ secrets.PYPI_PASSWORD }} || echo "Already pushed to pypi"
           gh release upload --clobber ${{ env.TAG_NAME }} dist/*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}