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

fix(black): allow to set arguments

parent 147d185e

README.md

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ This job **disabled by default** and runs [black](https://black.readthedocs.io) 
| Input / Variable | Description                                                             | Default value     |

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

| `black-enabled` / `PYTHON_BLACK_ENABLED` | Set to `true` to enable black job               | _none_ (disabled) |

| `black-files` / `PYTHON_BLACK_FILES`     | Files or directories to analyse           | .                 |

| `black-args` / `PYTHON_BLACK_ARGS`     | Additional [black options](https://black.readthedocs.io/en/stable/usage_and_configuration/the_basics.html) | _none_ |



### `py-isort` job

kicker.json

+3 −3
Original line number Diff line number Diff line
@@ -281,9 +281,9 @@ 
      "enable_with": "PYTHON_BLACK_ENABLED",

      "variables": [

        {

          "name": "PYTHON_BLACK_FILES",

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

          "default": ".",

          "name": "PYTHON_BLACK_ARGS",

          "description": "Additional [black options](https://black.readthedocs.io/en/stable/usage_and_configuration/the_basics.html)",

          "default": "",

          "advanced": true

        }

      ]

templates/gitlab-ci-python.yml

+5 −5
Original line number Diff line number Diff line
@@ -178,9 +178,9 @@ spec: 
      description: Enable black

      type: boolean

      default: false

    black-files:

      description: Files or directories to analyse

      default: '.'

    black-args:

      description: Additional [black options](https://black.readthedocs.io/en/stable/usage_and_configuration/the_basics.html)

      default: ''

    isort-enabled:

      description: Enable isort

      type: boolean
@@ -364,7 +364,7 @@ variables: 
  PYTHON_AUTO_RELEASE_ENABLED: $[[ inputs.auto-release-enabled ]]



  PYTHON_BLACK_ENABLED: $[[ inputs.black-enabled ]]

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

  PYTHON_BLACK_ARGS: $[[ inputs.black-args ]]

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

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

  RUFF_ENABLED: $[[ inputs.ruff-enabled ]]
@@ -1305,7 +1305,7 @@ py-black: 
  script:

    - install_requirements

    - _pip install black

    - _run black ${PYTHON_BLACK_FILES} --check --extend-exclude '(\/\.cache\/|\/\.venv\/)'

    - _run black . --check --extend-exclude '(\/\.cache\/|\/\.venv\/)' ${PYTHON_BLACK_ARGS}

  rules:

    # exclude if $PYTHON_BLACK_ENABLED not set

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