fix: ci ruff

.github/workflows/bk-login.yml

@@ -26,8 +26,8 @@ jobs:
       - name: Format & Lint with ruff
         run: |
           pip install ruff==0.1.4
-          ruff format src/bk-login --config=src/bk-login/pyproject.toml
-          ruff src/bk-login --config=src/bk-login/pyproject.toml
+          ruff format src/bk-login --config=src/bk-login/pyproject.toml --no-cache
+          ruff src/bk-login --config=src/bk-login/pyproject.toml --no-cache
       - name: Lint with mypy
         run: |
           pip install mypy==1.6.1 types-requests==2.31.0.2 types-setuptools==57.4.18 types-dataclasses==0.1.7 types-redis==3.5.18 types-PyMySQL==1.1.0.1 types-six==0.1.9 types-toml==0.1.5 types-pytz==2023.3.0.0 types-urllib3==1.26.25.14

.github/workflows/bk-user.yml

@@ -26,8 +26,8 @@ jobs:
       - name: Format & Lint with ruff
         run: |
           pip install ruff==0.1.4
-          ruff format src/bk-user --config=src/bk-user/pyproject.toml
-          ruff src/bk-user --config=src/bk-user/pyproject.toml
+          ruff format src/bk-user --config=src/bk-user/pyproject.toml --no-cache
+          ruff src/bk-user --config=src/bk-user/pyproject.toml --no-cache
       - name: Lint with mypy
         run: |
           pip install mypy==1.6.1 types-requests==2.31.0.2 types-setuptools==57.4.18 types-dataclasses==0.1.7 types-redis==3.5.18 types-PyMySQL==1.1.0.1 types-six==0.1.9 types-toml==0.1.5 types-pytz==2023.3.0.0 types-urllib3==1.26.25.14

.github/workflows/idp-plugins.yml

@@ -21,8 +21,8 @@ jobs:
       - name: Format & Lint with ruff
         run: |
           pip install ruff==0.1.4
-          ruff format src/idp-plugins --config=src/idp-plugins/pyproject.toml
-          ruff src/idp-plugins --config=src/idp-plugins/pyproject.toml
+          ruff format src/idp-plugins --config=src/idp-plugins/pyproject.toml --no-cache
+          ruff src/idp-plugins --config=src/idp-plugins/pyproject.toml --no-cache
       - name: Lint with mypy
         run: |
           pip install mypy==1.6.1 types-requests==2.31.0.2 types-setuptools==57.4.18 types-dataclasses==0.1.7 types-redis==3.5.18 types-PyMySQL==1.1.0.1 types-six==0.1.9 types-toml==0.1.5 types-pytz==2023.3.0.0 types-urllib3==1.26.25.14

.pre-commit-config.yaml

@@ -55,13 +55,13 @@ repos:
         name: ruff-formatter
         language: python
         types: [python]
-        entry: ruff format --config=src/bk-user/pyproject.toml --force-exclude
+        entry: ruff format --config=src/bk-user/pyproject.toml --no-cache
         files: src/bk-user/
       - id: ruff
         name: ruff
         language: python
         types: [python]
-        entry: ruff --config=src/bk-user/pyproject.toml --force-exclude --fix
+        entry: ruff --config=src/bk-user/pyproject.toml --fix --no-cache
         files: src/bk-user/
       - id: mypy
         name: mypy
@@ -80,13 +80,13 @@ repos:
         name: ruff-formatter
         language: python
         types: [python]
-        entry: ruff format --config=src/bk-login/pyproject.toml --force-exclude
+        entry: ruff format --config=src/bk-login/pyproject.toml --no-cache
         files: src/bk-login/
       - id: ruff
         name: ruff
         language: python
         types: [python]
-        entry: ruff --config=src/bk-login/pyproject.toml --force-exclude --fix
+        entry: ruff --config=src/bk-login/pyproject.toml --fix --no-cache
         files: src/bk-login/
       - id: mypy
         name: mypy
@@ -105,13 +105,13 @@ repos:
         name: ruff-formatter
         language: python
         types: [python]
-        entry: ruff format --config=src/bk-plugins/pyproject.toml --force-exclude
+        entry: ruff format --config=src/bk-plugins/pyproject.toml --no-cache
         files: src/bk-plugins/
       - id: ruff
         name: ruff
         language: python
         types: [python]
-        entry: ruff --config=src/idp-plugins/pyproject.toml --force-exclude --fix
+        entry: ruff --config=src/idp-plugins/pyproject.toml --fix --no-cache
         files: src/idp-plugins/
       - id: mypy
         name: mypy

src/bk-login/pyproject.toml

@@ -109,6 +109,7 @@ exclude = [
     "venv",
     "*/migrations/*",
 ]
+force-exclude = true
 
 [tool.ruff.mccabe]
 # Unlike Flake8, default to a complexity level of 10.

src/bk-user/bkuser/apis/web/idp/swagger.py

@@ -9,9 +9,11 @@
 specific language governing permissions and limitations under the License.
 """
 from typing import Dict
+
 from drf_yasg import openapi
-from bkuser.utils.pydantic import gen_openapi_schema
+
 from bkuser.idp_plugins.base import list_plugin_cls
+from bkuser.utils.pydantic import gen_openapi_schema
 
 
 def get_idp_plugin_cfg_schema_map() -> Dict[str, openapi.Schema]:

src/bk-user/bkuser/apis/web/idp/views.py

@@ -21,7 +21,6 @@
 from bkuser.apps.permission.constants import PermAction
 from bkuser.apps.permission.permissions import perm_class
 from bkuser.common.error_codes import error_codes
-from .swagger import get_idp_plugin_cfg_schema_map
 
 from .serializers import (
     IdpCreateInputSLZ,
@@ -33,6 +32,7 @@
     IdpSearchOutputSLZ,
     IdpUpdateInputSLZ,
 )
+from .swagger import get_idp_plugin_cfg_schema_map
 
 
 class IdpPluginListApi(generics.ListAPIView):

src/bk-user/pyproject.toml

@@ -128,6 +128,7 @@ exclude = [
     "venv",
     "*/migrations/*",
 ]
+force-exclude = true
 
 [tool.ruff.mccabe]
 # Unlike Flake8, default to a complexity level of 10.

src/idp-plugins/pyproject.toml

@@ -91,6 +91,7 @@ exclude = [
     "venv",
     "*/migrations/*",
 ]
+force-exclude = true
 
 [tool.ruff.mccabe]
 # Unlike Flake8, default to a complexity level of 10.