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

fix(isort): let configure args

parent 1511a239

README.md

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +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                 | .                 |

| `isort-args` / `PYTHON_ISORT_ARGS`       | Additional [Isort options](https://pycqa.github.io/isort/docs/configuration/options.html) | .                 |



### `py-ruff` job

kicker.json

+2 −2
Original line number Diff line number Diff line
@@ -295,8 +295,8 @@ 
      "enable_with": "PYTHON_ISORT_ENABLED",

      "variables": [

        {

          "name": "PYTHON_ISORT_FILES",

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

          "name": "PYTHON_ISORT_ARGS",

          "description": "Additional [Isort options](https://pycqa.github.io/isort/docs/configuration/options.html)",

          "default": ".",

          "advanced": true

        }

templates/gitlab-ci-python.yml

+4 −4
Original line number Diff line number Diff line
@@ -185,8 +185,8 @@ spec: 
      description: Enable isort

      type: boolean

      default: false

    isort-files:

      description: Files or directories to analyse

    isort-args:

      description: Additional [Isort options](https://pycqa.github.io/isort/docs/configuration/options.html)

      default: '.'

    ruff-enabled:

      description: Enable Ruff
@@ -366,7 +366,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 ]]

  PYTHON_ISORT_ARGS: $[[ inputs.isort-args ]]

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

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

  RUFF_FILES: $[[ inputs.ruff-files ]]
@@ -1318,7 +1318,7 @@ py-isort: 
  script:

    - install_requirements

    - _pip install isort

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

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

  rules:

    # exclude if $PYTHON_ISORT_ENABLED not set

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