Skip to content

Commit 0274309

Browse files
committed
Update cookiecutter
1 parent 23ff851 commit 0274309

File tree

6 files changed

+8
-9
lines changed

6 files changed

+8
-9
lines changed

.ci/run_container.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,6 @@ else
6969
fi
7070
export PULP_CONTENT_ORIGIN
7171

72-
if [ "${PULP_DOMAIN_ENABLED:-}" = "true" ]
73-
then
74-
# shellcheck disable=SC2089
75-
export PULP_ENABLED_PLUGINS="['pulp-certguard', 'pulp_container', 'pulp_file', 'pulp_python', 'pulp_rpm']"
76-
fi
77-
78-
# shellcheck disable=SC2090
7972
"${CONTAINER_RUNTIME}" \
8073
run ${RM:+--rm} \
8174
--env S6_KEEP_ENV=1 \

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
upper_bounds: true
5555
- image_tag: "3.73"
5656
pulp_domain_enabled: "true"
57+
pulp_enabled_plugins: "['pulp-certguard', 'pulp_container', 'pulp_file', 'pulp_python', 'pulp_rpm']"
5758
python: "3.10"
5859
- image_tag: "3.63"
5960
pulp_https: "true"
@@ -111,6 +112,7 @@ jobs:
111112
PULP_OAUTH2: "${{ matrix.pulp_oauth2 }}"
112113
PULP_API_ROOT: "${{ matrix.pulp_api_root }}"
113114
PULP_DOMAIN_ENABLED: "${{ matrix.pulp_domain_enabled }}"
115+
PULP_ENABLED_PLUGINS: "${{ matrix.pulp_enabled_plugins }}"
114116
OAS_VERSION: "${{ matrix.oas_version }}"
115117
run: |
116118
.ci/run_container.sh make livetest

cookiecutter/ci/{{ cookiecutter.__project_name }}/.ci/run_container.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ export PULP_CONTENT_ORIGIN
7676
${PULP_HTTPS:+--env PULP_HTTPS} \
7777
${PULP_OAUTH2:+--env PULP_OAUTH2} \
7878
${PULP_API_ROOT:+--env PULP_API_ROOT} \
79+
${PULP_DOMAIN_ENABLED:+--env PULP_DOMAIN_ENABLED} \
80+
${PULP_ENABLED_PLUGINS:+--env PULP_ENABLED_PLUGINS} \
7981
--env PULP_CONTENT_ORIGIN \
8082
--detach \
8183
--name "pulp-ephemeral" \

cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ jobs:
8282
PULP_HTTPS: "${{ matrix.pulp_https }}"
8383
PULP_OAUTH2: "${{ matrix.pulp_oauth2 }}"
8484
PULP_API_ROOT: "${{ matrix.pulp_api_root }}"
85+
PULP_DOMAIN_ENABLED: "${{ matrix.pulp_domain_enabled }}"
86+
PULP_ENABLED_PLUGINS: "${{ matrix.pulp_enabled_plugins }}"
8587
OAS_VERSION: "${{ matrix.oas_version }}"
8688
{%- endraw %}
8789
run: |

cookiecutter/ci/{{ cookiecutter.__project_name }}/lint_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
black==25.1.0
33
flake8==7.1.2
44
flake8-pyproject==1.2.3
5-
isort==6.0.0
5+
isort==6.0.1
66
mypy==1.15.0
77
shellcheck-py==0.10.0.1
88

cookiecutter/pulp_filter_extension.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,5 +135,5 @@ def __init__(self, environment: Environment):
135135
({"b": 1, "a": 0}, 0, "", "---\na: 0\nb: 1\n...\n"),
136136
],
137137
)
138-
def test_to_jaml(value, level, embed_in, out):
138+
def test_to_jaml(value: t.Any, level: int, embed_in: str, out: str) -> None:
139139
assert to_jaml(value, level, embed_in) == out

0 commit comments

Comments
 (0)