Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .ci/run_container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion cookiecutter/pulp_filter_extension.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading