Skip to content

Commit

Permalink
Merge branch 'master' into chore/imporve_python_tooling_docs
Browse files Browse the repository at this point in the history
  • Loading branch information
MaxymVlasov authored Jan 14, 2025
2 parents 84b8b83 + 2e6b270 commit 4c207c5
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ jobs:
- macos-13
- windows-2025
toxenv:
- py
- pytest
xfail:
- false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ jobs:
shell: bash
- name: Download all the dists
if: >-
contains(fromJSON('["metadata-validation", "py"]'), inputs.toxenv)
contains(fromJSON('["metadata-validation", "pytest"]'), inputs.toxenv)
uses: actions/download-artifact@v4
with:
name: ${{ inputs.dists-artifact-name }}
Expand Down
2 changes: 1 addition & 1 deletion hooks/_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ function common::parse_and_export_env_vars {
# `$arg` will be checked in `if` conditional, `$ARGS` will be used in the next functions.
# shellcheck disable=SC2016 # '${' should not be expanded
arg=${arg/'${'$env_var_name'}'/$env_var_value}
ARGS[$arg_idx]=$arg
ARGS[arg_idx]=$arg
# shellcheck disable=SC2016 # '${' should not be expanded
common::colorify "green" 'After ${'"$env_var_name"'} expansion: '"'$arg'\n"
continue
Expand Down
2 changes: 1 addition & 1 deletion src/pre_commit_terraform/terraform_docs_replace.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def invoke_cli_app(parsed_cli_args: Namespace) -> ReturnCodeType:
category=UserWarning,
)

dirs = []
dirs: list[str] = []
for filename in cast_to(list[str], parsed_cli_args.filenames):
if (os.path.realpath(filename) not in dirs and
(filename.endswith(".tf") or filename.endswith(".tfvars"))):
Expand Down
3 changes: 3 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ set_env =
COVERAGE_PROCESS_START = {toxinidir}{/}.coveragerc
wheel_build_env = .pkg

# Duplicate default 'py' env to 'pytest' to be able run pytest with 'tox run -e pytest'
[testenv:pytest]


[testenv:cleanup-dists]
description =
Expand Down

0 comments on commit 4c207c5

Please sign in to comment.