From f858f6503864cb6a9d9269c93cc2a8a08e7f67de Mon Sep 17 00:00:00 2001 From: Teo Tiefenbacher Date: Mon, 16 Aug 2021 09:43:49 +0200 Subject: [PATCH 1/2] Fixup: ran black+flake8 on caramel/config+models --- caramel/config.py | 2 +- caramel/models.py | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/caramel/config.py b/caramel/config.py index f55b355..d1ef2fd 100644 --- a/caramel/config.py +++ b/caramel/config.py @@ -221,7 +221,7 @@ def get_log_level(argument_level, logger=None, env=None): logger = logging.getLogger() current_level = logger.level - argument_verbosity = logging.ERROR - argument_level * 10 # level steps are 10 + argument_verbosity = logging.ERROR - argument_level * 10 # level steps are 10 verbosity = min(argument_verbosity, env_level, current_level) log_level = ( verbosity if logging.DEBUG <= verbosity <= logging.ERROR else logging.ERROR diff --git a/caramel/models.py b/caramel/models.py index 92b3e4a..8dcff87 100644 --- a/caramel/models.py +++ b/caramel/models.py @@ -2,10 +2,7 @@ # vim: expandtab shiftwidth=4 softtabstop=4 tabstop=17 filetype=python : import sqlalchemy as _sa -from sqlalchemy.ext.declarative import ( - declared_attr, - as_declarative -) +from sqlalchemy.ext.declarative import declared_attr, as_declarative import sqlalchemy.orm as _orm from zope.sqlalchemy import register @@ -92,7 +89,7 @@ def _fkcolumn(referent, *args, **kwargs): class Base(object): @declared_attr # type: ignore def __tablename__(cls) -> str: # pylint: disable=no-self-argument - return cls.__name__.lower() # pylint: disable=no-member + return cls.__name__.lower() # pylint: disable=no-member id = _sa.Column(_sa.Integer, primary_key=True) From e72b7858282f670dd01a23b9543b396e3d561371 Mon Sep 17 00:00:00 2001 From: Teo Tiefenbacher Date: Mon, 16 Aug 2021 10:00:19 +0200 Subject: [PATCH 2/2] UGLYCOMMITTOMAKERUN --- .gitlab-ci.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00b9e75..82d876f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,11 +13,14 @@ workflow: # Similar to "MergeRequest-Pipelines" default template. # Adds extra "EXTERNAL_PULL_REQUEST_IID" # see: https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Workflows/MergeRequest-Pipelines.gitlab-ci.yml - rules: - - if: $CI_MERGE_REQUEST_IID - - if: $CI_EXTERNAL_PULL_REQUEST_IID - - if: $CI_COMMIT_TAG - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + # rules: + # - if: $CI_MERGE_REQUEST_IID + # - if: $CI_EXTERNAL_PULL_REQUEST_IID + # - if: $CI_COMMIT_TAG + # - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH +default: + tags: + ~ stages: - test