Skip to content

Commit 4c207c5

Browse files
authored
Merge branch 'master' into chore/imporve_python_tooling_docs
2 parents 84b8b83 + 2e6b270 commit 4c207c5

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

.github/workflows/ci-cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ jobs:
452452
- macos-13
453453
- windows-2025
454454
toxenv:
455-
- py
455+
- pytest
456456
xfail:
457457
- false
458458

.github/workflows/reusable-tox.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ jobs:
262262
shell: bash
263263
- name: Download all the dists
264264
if: >-
265-
contains(fromJSON('["metadata-validation", "py"]'), inputs.toxenv)
265+
contains(fromJSON('["metadata-validation", "pytest"]'), inputs.toxenv)
266266
uses: actions/download-artifact@v4
267267
with:
268268
name: ${{ inputs.dists-artifact-name }}

hooks/_common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ function common::parse_and_export_env_vars {
139139
# `$arg` will be checked in `if` conditional, `$ARGS` will be used in the next functions.
140140
# shellcheck disable=SC2016 # '${' should not be expanded
141141
arg=${arg/'${'$env_var_name'}'/$env_var_value}
142-
ARGS[$arg_idx]=$arg
142+
ARGS[arg_idx]=$arg
143143
# shellcheck disable=SC2016 # '${' should not be expanded
144144
common::colorify "green" 'After ${'"$env_var_name"'} expansion: '"'$arg'\n"
145145
continue

src/pre_commit_terraform/terraform_docs_replace.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def invoke_cli_app(parsed_cli_args: Namespace) -> ReturnCodeType:
4949
category=UserWarning,
5050
)
5151

52-
dirs = []
52+
dirs: list[str] = []
5353
for filename in cast_to(list[str], parsed_cli_args.filenames):
5454
if (os.path.realpath(filename) not in dirs and
5555
(filename.endswith(".tf") or filename.endswith(".tfvars"))):

tox.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ set_env =
112112
COVERAGE_PROCESS_START = {toxinidir}{/}.coveragerc
113113
wheel_build_env = .pkg
114114

115+
# Duplicate default 'py' env to 'pytest' to be able run pytest with 'tox run -e pytest'
116+
[testenv:pytest]
117+
115118

116119
[testenv:cleanup-dists]
117120
description =

0 commit comments

Comments
 (0)