diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e70771c2cd1ba710785f6968318360cdad5fbf98..3442e0ae06d3d4cc4d7fbd95948f5f36f9fbedfc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,6 @@ Build Images: - plugins/* - scripts/* variables: - PLATFORMS: "" BUILD_ARGS: >- wp_version=$WORDPRESS_VERSION php_version=$PHP_VERSION @@ -45,6 +44,7 @@ Build Images: parallel: matrix: - TARGET: [nginx, fastcgi] + PLATFORMS: [""] trigger: include: - project: dom/project-templates diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f526eaa9df978dac0b4e63c253f77c2115d6af9e..a8fae9e756aa27ac94e809bd065e4efbb34e0037 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -90,10 +90,10 @@ repos: - flake8-tabs - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.910 + rev: v0.982 hooks: - id: mypy - args: ["--config-file=.lint.cfg"] + args: ["--config-file=.lint.cfg", "--python-version=3.9"] additional_dependencies: - types-requests - behave-utils ~=0.3.2 diff --git a/tests/environment.py b/tests/environment.py index 1d0837e813d12b580f5060234ec56857746f2ed2..3d839be4e963260ed4dcfbb2e20606da2aa533d4 100644 --- a/tests/environment.py +++ b/tests/environment.py @@ -1,4 +1,4 @@ -# Copyright 2021 Dominik Sekotill +# Copyright 2021-2022 Dominik Sekotill # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/tests/steps/commands.py b/tests/steps/commands.py index 422a8f7a6bb0343d4666afea6a9abe9020dd1fb0..acd1f72327a317eef1cf51317cb93e279a3cb5f7 100644 --- a/tests/steps/commands.py +++ b/tests/steps/commands.py @@ -1,4 +1,4 @@ -# Copyright 2021 Dominik Sekotill +# Copyright 2021-2022 Dominik Sekotill # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/tests/steps/pages.py b/tests/steps/pages.py index 7921b4f2a00d1c0135d79d3a4f5e93b6e81a1f22..62638474722e26418e0c2d44ad3052a06f3b680a 100644 --- a/tests/steps/pages.py +++ b/tests/steps/pages.py @@ -1,4 +1,4 @@ -# Copyright 2021 Dominik Sekotill +# Copyright 2021-2022 Dominik Sekotill # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this @@ -64,7 +64,9 @@ def create_post(context: Context, post_type: PostType, text: str|None = None) -> """ Create a WP post of the given type and store it in the context with the type as the name """ - post = use_fixture(wp_post, context, post_type, text or getattr(context, "text", "")) + text = text or getattr(context, "text", "") + assert isinstance(text, str) + post = use_fixture(wp_post, context, post_type, text) setattr(context, post_type.value, post) diff --git a/tests/wp.py b/tests/wp.py index 9d22f216c59c1609e7810164d58dcb7fde2e3c8f..efc01b3e8f99751265d7c8c76891a7bb7ef77def 100644 --- a/tests/wp.py +++ b/tests/wp.py @@ -1,4 +1,4 @@ -# Copyright 2021 Dominik Sekotill +# Copyright 2021-2022 Dominik Sekotill # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this