From a56ccfd45d594f650bdd380b3b191371fe8680e4 Mon Sep 17 00:00:00 2001 From: uy/sun Date: Wed, 4 Dec 2024 21:49:26 +0800 Subject: [PATCH] =?UTF-8?q?chore(deps):=20=E7=A7=BB=E9=99=A4=20optional-de?= =?UTF-8?q?pendencies=20(#306)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/main.yml | 3 --- examples/store-test.yml | 5 ++--- pyproject.toml | 5 ++--- uv.lock | 10 +++------- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e3bb0800..b0842054 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,9 +21,6 @@ jobs: with: enable-cache: true - - name: Sync dependencies - run: uv sync --all-extras - - name: Run tests run: uv run poe test diff --git a/examples/store-test.yml b/examples/store-test.yml index b51ce8d4..b1018dc1 100644 --- a/examples/store-test.yml +++ b/examples/store-test.yml @@ -45,12 +45,11 @@ jobs: - name: Test plugin if: ${{ !contains(fromJSON('["Bot", "Adapter", "Plugin"]'), github.event.client_payload.type) }} - run: | - uv run --no-dev --extra plugin python -m src.providers.store_test plugin-test --offset ${{ github.event.inputs.offset || 0 }} --limit ${{ github.event.inputs.limit || 50 }} ${{ github.event.inputs.args }} + run: uv run --no-dev -m src.providers.store_test plugin-test --offset ${{ github.event.inputs.offset || 0 }} --limit ${{ github.event.inputs.limit || 50 }} ${{ github.event.inputs.args }} - name: Update registry if: ${{ contains(fromJSON('["Bot", "Adapter", "Plugin"]'), github.event.client_payload.type) }} - run: uv run --no-dev --extra plugin python -m src.providers.store_test registry-update + run: uv run --no-dev -m src.providers.store_test registry-update env: REGISTRY_UPDATE_PAYLOAD: ${{ toJson(github.event.client_payload) }} diff --git a/pyproject.toml b/pyproject.toml index 23d15916..cbab64fb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,6 +7,7 @@ readme = "README.md" license = { file = "LICENSE" } requires-python = ">= 3.12" dependencies = [ + "click>=8.1.7", "docker>=7.1.0", "githubkit>=0.11.14", "jinja2>=3.1.4", @@ -15,6 +16,7 @@ dependencies = [ "pre-commit>=4.0.1", "pydantic-extra-types>=2.10.0", "pyjson5>=1.6.7", + "tzdata>=2024.2", ] [project.urls] @@ -23,9 +25,6 @@ Repository = "https://github.com/nonebot/noneflow.git" Issues = "https://github.com/nonebot/noneflow/issues" Changelog = "https://github.com/nonebot/noneflow/blob/main/CHANGELOG.md" -[project.optional-dependencies] -plugin = ["click>=8.1.7", "tzdata>=2024.2"] - [tool.uv] dev-dependencies = [ "bump-my-version>=0.28.1", diff --git a/uv.lock b/uv.lock index 11e3d3ac..f9f71bb2 100644 --- a/uv.lock +++ b/uv.lock @@ -657,6 +657,7 @@ name = "noneflow" version = "4.1.2" source = { virtual = "." } dependencies = [ + { name = "click" }, { name = "docker" }, { name = "githubkit" }, { name = "jinja2" }, @@ -665,11 +666,6 @@ dependencies = [ { name = "pre-commit" }, { name = "pydantic-extra-types" }, { name = "pyjson5" }, -] - -[package.optional-dependencies] -plugin = [ - { name = "click" }, { name = "tzdata" }, ] @@ -688,7 +684,7 @@ dev = [ [package.metadata] requires-dist = [ - { name = "click", marker = "extra == 'plugin'", specifier = ">=8.1.7" }, + { name = "click", specifier = ">=8.1.7" }, { name = "docker", specifier = ">=7.1.0" }, { name = "githubkit", specifier = ">=0.11.14" }, { name = "jinja2", specifier = ">=3.1.4" }, @@ -697,7 +693,7 @@ requires-dist = [ { name = "pre-commit", specifier = ">=4.0.1" }, { name = "pydantic-extra-types", specifier = ">=2.10.0" }, { name = "pyjson5", specifier = ">=1.6.7" }, - { name = "tzdata", marker = "extra == 'plugin'", specifier = ">=2024.2" }, + { name = "tzdata", specifier = ">=2024.2" }, ] [package.metadata.requires-dev]