Commit ccbccbae authored by Federico Falconieri's avatar Federico Falconieri
Browse files

Merge branch 'hoverht-master-patch-36651' into 'master'

fix: improves UX in pylint and pytest

See merge request ci/templates!38
parents 61f253e8 6b66f7b9
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -29,9 +29,6 @@ docker:kaniko:
  variables:
    CONTEXT: templates_tests/python

yaml:yamllint:
  allow_failure: true # for now

# We only check if it runs properly, not if our image has problems
docker:anchore:grype:
  variables:
+15 −15
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
name = "appdirs"
version = "1.4.4"
description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
category = "dev"
category = "main"
optional = false
python-versions = "*"

@@ -10,7 +10,7 @@ python-versions = "*"
name = "cfgv"
version = "3.2.0"
description = "Validate configuration and produce human readable error messages."
category = "dev"
category = "main"
optional = false
python-versions = ">=3.6.1"

@@ -18,7 +18,7 @@ python-versions = ">=3.6.1"
name = "distlib"
version = "0.3.1"
description = "Distribution utilities"
category = "dev"
category = "main"
optional = false
python-versions = "*"

@@ -26,7 +26,7 @@ python-versions = "*"
name = "filelock"
version = "3.0.12"
description = "A platform independent file lock."
category = "dev"
category = "main"
optional = false
python-versions = "*"

@@ -34,7 +34,7 @@ python-versions = "*"
name = "identify"
version = "2.2.0"
description = "File identification library for Python"
category = "dev"
category = "main"
optional = false
python-versions = ">=3.6.1"

@@ -45,7 +45,7 @@ license = ["editdistance-s"]
name = "importlib-metadata"
version = "3.7.3"
description = "Read metadata from Python packages"
category = "dev"
category = "main"
optional = false
python-versions = ">=3.6"

@@ -61,7 +61,7 @@ testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake
name = "nodeenv"
version = "1.5.0"
description = "Node.js virtual environment builder"
category = "dev"
category = "main"
optional = false
python-versions = "*"

@@ -77,7 +77,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
name = "pre-commit"
version = "2.11.1"
description = "A framework for managing and maintaining multi-language pre-commit hooks."
category = "dev"
category = "main"
optional = false
python-versions = ">=3.6.1"

@@ -94,7 +94,7 @@ virtualenv = ">=20.0.8"
name = "pyyaml"
version = "5.4.1"
description = "YAML parser and emitter for Python"
category = "dev"
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"

@@ -102,7 +102,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
name = "six"
version = "1.15.0"
description = "Python 2 and 3 compatibility utilities"
category = "dev"
category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"

@@ -110,7 +110,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
name = "toml"
version = "0.10.2"
description = "Python Library for Tom's Obvious, Minimal Language"
category = "dev"
category = "main"
optional = false
python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"

@@ -118,7 +118,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
name = "typing-extensions"
version = "3.7.4.3"
description = "Backported and Experimental Type Hints for Python 3.5+"
category = "dev"
category = "main"
optional = false
python-versions = "*"

@@ -126,7 +126,7 @@ python-versions = "*"
name = "virtualenv"
version = "20.4.3"
description = "Virtual Python Environment builder"
category = "dev"
category = "main"
optional = false
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"

@@ -157,7 +157,7 @@ pyyaml = "*"
name = "zipp"
version = "3.4.1"
description = "Backport of pathlib-compatible object wrapper for zip files"
category = "dev"
category = "main"
optional = false
python-versions = ">=3.6"

@@ -168,7 +168,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt
[metadata]
lock-version = "1.1"
python-versions = "^3.7"
content-hash = "ed5cb19fab32e471b463ed3d41c88229effe85624a047481120edd2a256ae635"
content-hash = "4eda816281d3949704a620f4c595a8607d823762323ee64162405a5fb66c30e7"

[metadata.files]
appdirs = [
+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ license = "LGPLv3"

[tool.poetry.dependencies]
python = "^3.7"
pre-commit = "^2.11.1"

[tool.poetry.dev-dependencies]
yamllint = "^1.26.0"
+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ python:pylint:
  image: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-testing
  script:
    - pip show pylint
    - echo "pylint needs at least a score of ${PYLINT_THRESHOLD} for this job to pass."  # yamllint disable rule:line-length
    - pylint --output-format=pylint_junit.JUnitReporter $(find ${CHECK_PATH} -type f -name '*.py' -print) > ${CI_PROJECT_DIR}/pylint-report.xml || true  # yamllint disable-line rule:line-length
    - pylint ${EXTRA_ARGS} --output-format=colorized --fail-under ${PYLINT_THRESHOLD} $(find ${CHECK_PATH} -type f -name '*.py' -print)  # yamllint disable rule:line-length
  artifacts:
+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ python:pytest:
    EXTRA_ARGS: ""  # Set optional arguments
  script:
    - pip show pytest
    - echo "pylint needs at least a score of ${PYTEST_COVERAGE_THRESHOLD} for this job to pass."  # yamllint disable rule:line-length
    - python -m pytest -vv --cov=${PYTHON_PACKAGE} --cov-fail-under=${PYTEST_COVERAGE_THRESHOLD} --junitxml=${CI_PROJECT_DIR}/pytest-report.xml ${EXTRA_ARGS}  # yamllint disable rule:line-length
  artifacts:
    reports: