From 7e8002283a4304f188218a6fc75b5214d06d74cb Mon Sep 17 00:00:00 2001
From: Dorian Turba <froggit.commit.z3jqj@simplelogin.com>
Date: Mon, 28 Aug 2023 18:43:06 +0200
Subject: [PATCH] update black, isort and pytest .yml
---
templates/python/code_quality/black/black.yml | 5 ++---
templates/python/code_quality/isort/isort.yml | 5 ++---
templates/python/testing/pytest/pytest.yml | 5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/templates/python/code_quality/black/black.yml b/templates/python/code_quality/black/black.yml
index 1ced1ad..fa6945b 100644
--- a/templates/python/code_quality/black/black.yml
+++ b/templates/python/code_quality/black/black.yml
@@ -2,11 +2,10 @@ include:
- remote: 'https://api.r2devops.io/job/r/gitlab/dorianturba/r2devops_catalog/r2_metadata/python_install@latest.yaml'
black:
- image: python:${IMAGE_TAG}
+ extends:
+ - .python_install
stage: code_quality
variables:
- IMAGE_TAG: !reference [.python_install, variables, IMAGE_TAG]
- PROJECT_PATH: "."
PYTHON_SETUP: "pip install black"
script:
- !reference [.python_install, script]
diff --git a/templates/python/code_quality/isort/isort.yml b/templates/python/code_quality/isort/isort.yml
index b19874a..4702817 100644
--- a/templates/python/code_quality/isort/isort.yml
+++ b/templates/python/code_quality/isort/isort.yml
@@ -2,11 +2,10 @@ include:
- remote: 'https://api.r2devops.io/job/r/gitlab/dorianturba/r2devops_catalog/r2_metadata/python_install@latest.yaml'
isort:
- image: python:${IMAGE_TAG}
+ extends:
+ - .python_install
stage: code_quality
variables:
- IMAGE_TAG: !reference [.python_install, variables, IMAGE_TAG]
- PROJECT_PATH: "."
PYTHON_SETUP: "pip install isort"
script:
- !reference [.python_install, script]
diff --git a/templates/python/testing/pytest/pytest.yml b/templates/python/testing/pytest/pytest.yml
index d646bad..62831fb 100644
--- a/templates/python/testing/pytest/pytest.yml
+++ b/templates/python/testing/pytest/pytest.yml
@@ -2,11 +2,10 @@ include:
- remote: 'https://api.r2devops.io/job/r/gitlab/dorianturba/r2devops_catalog/r2_metadata/python_install@latest.yaml'
pytest:
- image: python:${IMAGE_TAG}
+ extends:
+ - .python_install
stage: test
variables:
- IMAGE_TAG: !reference [.python_install, variables, IMAGE_TAG]
- PROJECT_PATH: "."
PYTHON_SETUP: "pip install -r ${PROJECT_PATH}/requirements.txt"
PYTEST_RUN_CMD: "pytest ${PROJECT_PATH}"
script:
--
GitLab