From d9c3af0944c219d82f6a14fd10b26f91aa2e77c7 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Thu, 13 Feb 2020 15:49:53 +0100 Subject: [PATCH 1/2] [meta] run lint-python job on ubuntu 18.04 black requires python >= 3.6 which is not available on ubuntu 16.04 --- .ci/jobs/elastic+helm-charts+master+template-lint-python.yml | 2 +- .ci/jobs/elastic+helm-charts+pull-request+lint-python.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/jobs/elastic+helm-charts+master+template-lint-python.yml b/.ci/jobs/elastic+helm-charts+master+template-lint-python.yml index 17a91b0cd..25048d9e4 100644 --- a/.ci/jobs/elastic+helm-charts+master+template-lint-python.yml +++ b/.ci/jobs/elastic+helm-charts+master+template-lint-python.yml @@ -11,7 +11,7 @@ type: slave name: label values: - - docker&&virtual + - docker&&virtual&&ubuntu-18.04 builders: - shell: |- #!/usr/local/bin/runbld diff --git a/.ci/jobs/elastic+helm-charts+pull-request+lint-python.yml b/.ci/jobs/elastic+helm-charts+pull-request+lint-python.yml index 5b696a139..5ec00f723 100644 --- a/.ci/jobs/elastic+helm-charts+pull-request+lint-python.yml +++ b/.ci/jobs/elastic+helm-charts+pull-request+lint-python.yml @@ -11,7 +11,7 @@ type: slave name: label values: - - docker&&virtual + - docker&&virtual&&ubuntu-18.04 builders: - shell: |- #!/usr/local/bin/runbld From fb7e774c2538969948d13830a19fff8490665da7 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Thu, 13 Feb 2020 16:03:36 +0100 Subject: [PATCH 2/2] [meta] exclude virtualenv files from python lint --- helpers/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/common.mk b/helpers/common.mk index 6334908df..8ced63fca 100644 --- a/helpers/common.mk +++ b/helpers/common.mk @@ -29,7 +29,7 @@ lint: ## Lint helm templates .PHONY: lint-python lint-python: ## Lint python scripts - black --diff --check . + black --diff --check --exclude='ve/|venv/' . .PHONY: pytest pytest: ## Run python tests