Commit f2c35bc0 authored by Guilhem Bonnefille's avatar Guilhem Bonnefille Committed by Pierre Smeyers
Browse files

fix(isort): parametrize files to analyse

parent d4abe43e

README.md

+2 −1
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ This job **disabled by default** and runs [isort](https://pycqa.github.io/isort/ 
| Input / Variable | Description                                                             | Default value     |

| ---------------- | ----------------------------------------------------------------------- | ----------------- |

| `isort-enabled` / `PYTHON_ISORT_ENABLED` | Set to `true` to enable isort job               | _none_ (disabled) |

| `isort-files` / `PYTHON_ISORT_FILES`     | Files or directories to analyse                 | .                 |



### `py-ruff` job

kicker.json

+12 −3
Original line number Diff line number Diff line
@@ -291,7 +291,15 @@ 
      "id": "isort",

      "name": "isort",

      "description": "Check imports order with [isort](https://pycqa.github.io/isort)",

      "enable_with": "PYTHON_ISORT_ENABLED"

      "enable_with": "PYTHON_ISORT_ENABLED",

      "variables": [

        {

          "name": "PYTHON_ISORT_FILES",

          "description": "Files or directories to analyse",

          "default": ".",

          "advanced": true

        }

      ]

    },

    {

      "id": "ruff",
@@ -470,3 +478,4 @@ 
    }

  ]

}

templates/gitlab-ci-python.yml

+5 −1
Original line number Diff line number Diff line
@@ -185,6 +185,9 @@ spec: 
      description: Enable isort

      type: boolean

      default: false

    isort-files:

      description: Files or directories to analyse

      default: '.'

    ruff-enabled:

      description: Enable Ruff

      type: boolean
@@ -360,6 +363,7 @@ variables: 
  PYTHON_BLACK_ENABLED: $[[ inputs.black-enabled ]]

  PYTHON_BLACK_FILES: $[[ inputs.black-files ]]

  PYTHON_ISORT_ENABLED: $[[ inputs.isort-enabled ]]

  PYTHON_ISORT_FILES: $[[ inputs.isort-files ]]

  RUFF_ENABLED: $[[ inputs.ruff-enabled ]]

  RUFF_ARGS: $[[ inputs.ruff-args ]]

  RUFF_FORMAT_ENABLED: $[[ inputs.ruff-format-enabled ]]
@@ -1310,7 +1314,7 @@ py-isort: 
  script:

    - install_requirements

    - _pip install isort

    - _run isort . --check-only --extend-skip .cache --extend-skip .venv

    - _run isort ${PYTHON_ISORT_FILES} --check-only --extend-skip .cache --extend-skip .venv

  rules:

    # exclude if $PYTHON_ISORT_ENABLED not set

    - if: '$PYTHON_ISORT_ENABLED != "true"'