diff --git a/.ci/run_container.sh b/.ci/run_container.sh index 7a6d57955..b3a1c7e9b 100755 --- a/.ci/run_container.sh +++ b/.ci/run_container.sh @@ -69,13 +69,6 @@ else fi export PULP_CONTENT_ORIGIN -if [ "${PULP_DOMAIN_ENABLED:-}" = "true" ] -then - # shellcheck disable=SC2089 - export PULP_ENABLED_PLUGINS="['pulp-certguard', 'pulp_container', 'pulp_file', 'pulp_python', 'pulp_rpm']" -fi - -# shellcheck disable=SC2090 "${CONTAINER_RUNTIME}" \ run ${RM:+--rm} \ --env S6_KEEP_ENV=1 \ diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 94eef17e5..3543d41ed 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,6 +54,7 @@ jobs: upper_bounds: true - image_tag: "3.73" pulp_domain_enabled: "true" + pulp_enabled_plugins: "['pulp-certguard', 'pulp_container', 'pulp_file', 'pulp_python', 'pulp_rpm']" python: "3.10" - image_tag: "3.63" pulp_https: "true" @@ -111,6 +112,7 @@ jobs: PULP_OAUTH2: "${{ matrix.pulp_oauth2 }}" PULP_API_ROOT: "${{ matrix.pulp_api_root }}" PULP_DOMAIN_ENABLED: "${{ matrix.pulp_domain_enabled }}" + PULP_ENABLED_PLUGINS: "${{ matrix.pulp_enabled_plugins }}" OAS_VERSION: "${{ matrix.oas_version }}" run: | .ci/run_container.sh make livetest diff --git a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.ci/run_container.sh b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.ci/run_container.sh index 2f7e8d909..b3a1c7e9b 100755 --- a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.ci/run_container.sh +++ b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.ci/run_container.sh @@ -76,6 +76,8 @@ export PULP_CONTENT_ORIGIN ${PULP_HTTPS:+--env PULP_HTTPS} \ ${PULP_OAUTH2:+--env PULP_OAUTH2} \ ${PULP_API_ROOT:+--env PULP_API_ROOT} \ + ${PULP_DOMAIN_ENABLED:+--env PULP_DOMAIN_ENABLED} \ + ${PULP_ENABLED_PLUGINS:+--env PULP_ENABLED_PLUGINS} \ --env PULP_CONTENT_ORIGIN \ --detach \ --name "pulp-ephemeral" \ diff --git a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/test.yml b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/test.yml index d357491bf..2904ae171 100644 --- a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/test.yml +++ b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/test.yml @@ -82,6 +82,8 @@ jobs: PULP_HTTPS: "${{ matrix.pulp_https }}" PULP_OAUTH2: "${{ matrix.pulp_oauth2 }}" PULP_API_ROOT: "${{ matrix.pulp_api_root }}" + PULP_DOMAIN_ENABLED: "${{ matrix.pulp_domain_enabled }}" + PULP_ENABLED_PLUGINS: "${{ matrix.pulp_enabled_plugins }}" OAS_VERSION: "${{ matrix.oas_version }}" {%- endraw %} run: | diff --git a/cookiecutter/ci/{{ cookiecutter.__project_name }}/lint_requirements.txt b/cookiecutter/ci/{{ cookiecutter.__project_name }}/lint_requirements.txt index c5da75745..89de0abfb 100644 --- a/cookiecutter/ci/{{ cookiecutter.__project_name }}/lint_requirements.txt +++ b/cookiecutter/ci/{{ cookiecutter.__project_name }}/lint_requirements.txt @@ -2,7 +2,7 @@ black==25.1.0 flake8==7.1.2 flake8-pyproject==1.2.3 -isort==6.0.0 +isort==6.0.1 mypy==1.15.0 shellcheck-py==0.10.0.1 diff --git a/cookiecutter/pulp_filter_extension.py b/cookiecutter/pulp_filter_extension.py index 6a6239a4b..c115806c7 100644 --- a/cookiecutter/pulp_filter_extension.py +++ b/cookiecutter/pulp_filter_extension.py @@ -135,5 +135,5 @@ def __init__(self, environment: Environment): ({"b": 1, "a": 0}, 0, "", "---\na: 0\nb: 1\n...\n"), ], ) - def test_to_jaml(value, level, embed_in, out): + def test_to_jaml(value: t.Any, level: int, embed_in: str, out: str) -> None: assert to_jaml(value, level, embed_in) == out