From 58bd7ab497ad670751d696aeb5300c951c15228f Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@garz-fricke.com> Date: Mon, 28 Aug 2023 14:23:35 +0000 Subject: [PATCH] Integrate gitlab-ci/fix_ap_fwr_generation and 4 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/cf371acad26826d3fc88461af1c9c9f86d6ec192 alphaplan_fwr: Remove obsolete pkg.py artifact The pkg.py file is no longer deployed by the build process. See commit https://git.seco.com/seco-ne/yocto/layers/meta-seconorth-distro/-/commit/e79e8579b1bed27ef1e6a9c83b79a482035b13cb -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/b2b43f71440b4ac36eb27e0b79c070f78665c029 Sourcery: keep "use-named-expression" check disabled This suggestion aims to reduce code size, but IMO for the expense of readability for non-python-experts, so we disable it. See for reference: https://docs.sourcery.ai/Reference/Python/Default-Rules/use-named-expression/ -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/ae8c5423959057ff0288355122d73d3669704d97 Sourcery: keep "use-next" check disabled I don't see any benefit in accepting the refactoring suggestions based on this rule. IMO it makes the code harder to read, especially for non- experienced Python developers. See for reference: https://docs.sourcery.ai/Reference/Python/Default-Rules/use-next/ -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/9462f826d14131169fe36f062c7139110220a15e Refactoring: raise specific errors See for reference: https://docs.sourcery.ai/Reference/Python/Default-Rules/raise-specific-error/ -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/61eb3e11ff3da4568285272cd932dbef0debff7d Switch all strings to formatted string literals (f-strings) The old printf-style string formatting syntax using '%' is not recommended anymore. See for reference: https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting https://docs.sourcery.ai/Reference/Python/Default-Rules/replace-interpolation-with-fstring/ Python 3.6 introduced f-strings as a better alternative: https://docs.python.org/3/reference/lexical_analysis.html#f-strings Consequently switch to this new syntax for all strings. --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index b2fb3e9..cf371ac 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit b2fb3e93b33a2cb14b50d30bf02c03f23b20c391 +Subproject commit cf371acad26826d3fc88461af1c9c9f86d6ec192 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09fbbcd..66e4fee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,9 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: b2fb3e93b33a2cb14b50d30bf02c03f23b20c391 + ref: cf371acad26826d3fc88461af1c9c9f86d6ec192 file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: b2fb3e93b33a2cb14b50d30bf02c03f23b20c391 + GITLAB_CI_REVISION: cf371acad26826d3fc88461af1c9c9f86d6ec192 BB_RECIPE_NAME: atmel-mxt -- GitLab