From 35efd55e10a4cf71284e75544e5d62dffa4feb9d Mon Sep 17 00:00:00 2001 From: Bartek Wrona <wrona@syncad.com> Date: Thu, 20 Mar 2025 19:18:37 +0100 Subject: [PATCH 1/2] Updated Python Image tag to use U24.04 version --- templates/python_projects.gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/python_projects.gitlab-ci.yml b/templates/python_projects.gitlab-ci.yml index bef8434..df0bc26 100644 --- a/templates/python_projects.gitlab-ci.yml +++ b/templates/python_projects.gitlab-ci.yml @@ -10,8 +10,8 @@ variables: PYTEST_LOG_DURATIONS: 0 # do not log test durations by default PYTEST_JUNIT_REPORT: "report.xml" # junit report location, used by GitLab # registries: - # uses registry.gitlab.syncad.com/hive/hive/ci-base-image:ubuntu22.04-10 - PYTHON_IMAGE_TAG: "@sha256:080b16fd53013aeb9b89b00a8dfc90fecf886173f46448b05f45cee376c43330" + # uses registry.gitlab.syncad.com/hive/hive/ci-base-image:ubuntu24.04-1 + PYTHON_IMAGE_TAG: "@sha256:813f18c42929193036fc4e0017981c16913766442ef8d146313c64785df29c2e" PYTHON_IMAGE: "registry.gitlab.syncad.com/hive/hive/ci-base-image${PYTHON_IMAGE_TAG}" # colors: TXT_GREEN: "\e[1;32m" -- GitLab From fccc10fc5c8b847d82ca7446c957caa49a7440f6 Mon Sep 17 00:00:00 2001 From: Bartek Wrona <wrona@syncad.com> Date: Fri, 21 Mar 2025 15:28:19 +0100 Subject: [PATCH 2/2] Updated ruff command spawn to satisfy this tool new version --- templates/python_projects.gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/python_projects.gitlab-ci.yml b/templates/python_projects.gitlab-ci.yml index df0bc26..3ff161e 100644 --- a/templates/python_projects.gitlab-ci.yml +++ b/templates/python_projects.gitlab-ci.yml @@ -63,9 +63,9 @@ variables: script: - if [ -z "${PYPROJECT_CONFIG_PATH}" ]; then MAYBE_EXPLICIT_CONFIG=""; else MAYBE_EXPLICIT_CONFIG="--config ${PYPROJECT_CONFIG_PATH}"; fi - echo -e "${TXT_BLUE}Linting all sources with Ruff (check)...${TXT_CLEAR}" && - ruff ${MAYBE_EXPLICIT_CONFIG} ${PACKAGES_TO_CHECK} + ruff check ${MAYBE_EXPLICIT_CONFIG} ${PACKAGES_TO_CHECK} - echo -e "${TXT_BLUE}Linting all sources with Ruff (diff)...${TXT_CLEAR}" && - ruff --diff ${MAYBE_EXPLICIT_CONFIG} ${PACKAGES_TO_CHECK} + ruff check --diff ${MAYBE_EXPLICIT_CONFIG} ${PACKAGES_TO_CHECK} .formatting_with_black_check_template: extends: .project_develop_configuration_template -- GitLab