Commit e43fa970 authored by Ruben ten Hove's avatar Ruben ten Hove
Browse files

Merge branch '72-push-pylint_extra_args-to-the-end-of-the-command' into 'main' 

fix: allow extra output formats using a variable

Closes #72

See merge request just-ci/templates!142
parents db77e1c6 64ab38ae

python/pylint.yml

+12 −4
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ variables: 
  PYLINT_THRESHOLD: "6"

  PYLINT_DEFAULT_ARGS: --recursive=y

  PYLINT_EXTRA_ARGS: ""

  PYLINT_EXTRA_OUTPUT_FORMATS: ""

  PYLINT_TARGET: "."



python:pylint:
@@ -21,10 +22,17 @@ python:pylint: 
  script:

    - !reference [".python:pre", script]

    - !reference [".python:pre-install", script]

    - pylint --fail-under=${PYLINT_THRESHOLD} ${PYLINT_DEFAULT_ARGS}

      ${PYLINT_EXTRA_ARGS}

      --output-format=pylint_junit.JUnitReporter:${CI_PROJECT_DIR}/pylint-report.xml,pylint_gitlab.GitlabCodeClimateReporter:${CI_PROJECT_DIR}/code-climate.json,colorized

      --ignore-paths=${PYTHON_EXCLUDE_PATHS} ${PYLINT_TARGET:-.}

    - |

      if [ "${PYLINT_EXTRA_OUTPUT_FORMATS}" != "" ]; then

        echo "[*] Extra output formats: ${PYLINT_EXTRA_OUTPUT_FORMATS}"

        if [ "${PYLINT_EXTRA_OUTPUT_FORMATS:0:1}" != "," ]; then

          PYLINT_EXTRA_OUTPUT_FORMATS=",${PYLINT_EXTRA_OUTPUT_FORMATS}"

        fi

      fi

    - pylint --fail-under=${PYLINT_THRESHOLD}

      --output-format=pylint_junit.JUnitReporter:${CI_PROJECT_DIR}/pylint-report.xml,pylint_gitlab.GitlabCodeClimateReporter:${CI_PROJECT_DIR}/code-climate.json,colorized${PYLINT_EXTRA_OUTPUT_FORMATS}

      --ignore-paths=${PYTHON_EXCLUDE_PATHS} ${PYLINT_DEFAULT_ARGS}

      ${PYLINT_EXTRA_ARGS} ${PYLINT_TARGET:-.}

  artifacts:

    reports:

      junit: pylint-report.xml

tests/jobs/python.yml

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ python:twine: 
  rules:

    - when: never



python:pylint:

  variables:

    PYLINT_EXTRA_OUTPUT_FORMATS: text:/tmp/pylint.txt



# This one takes about 5 minutes each time, so only test it when we change the job or its dependencies

python:pyinstaller:windows:

  rules: