Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into YR/Fix-build-number-appear…
Browse files Browse the repository at this point in the history
…ing-in-sdk-upload-via-pipeline/XSUP-30181
  • Loading branch information
RosenbergYehuda committed Dec 20, 2023
2 parents e7aec05 + 136f29d commit b748740
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 12 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Changelog
## Unreleased

## 1.25.0
* Added support to detect automatically the playground-id when running cli commands in xsoar-6.
* Added support to return war-room entries when running cli commands.
* Added support to automatically detect the correct file model by file path when reading files.
Expand All @@ -8,7 +10,7 @@
* Fixed an issue where *validate* command failed with release notes files for assets modeling rules folder.
* Added support for `skip` property in **pre-commit** hooks.
* **generate-unit-tests** command will require installation with `pip install demisto-sdk[generate-unit-tests]`.
* added the *IN150* and *IN161* errors to *allowed ignore errors* list.
* Added the *IN150* and *IN161* errors to *allowed ignore errors* list.
* Added support for `env`, `copy_files` property in **pre-commit** docker hooks.
* Added support to run specific hooks in **pre-commit**. Use with `demisto-sdk pre-commit <hook>`.
* **Breaking change**: Removed the command **run-unit-tests**. Use `demisto-sdk pre-commit pytest-in-docker` instead.
Expand Down
24 changes: 14 additions & 10 deletions demisto_sdk/commands/pre_commit/pre_commit_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -474,16 +474,20 @@ def prepare_and_run(
precommit_env["PRE_COMMIT_COLOR"] = "always"
self.exclude_python2_of_non_supported_hooks()

for (
python_version,
changed_files_by_version,
) in self.python_version_to_files.items():
changed_files_string = ", ".join(
sorted(str(file) for file in changed_files_by_version)
)
logger.info(
f"Running pre-commit with Python {python_version} on {changed_files_string}"
)
if self.all_files:
logger.info("Running pre-commit on all files")

else:
for (
python_version,
changed_files_by_version,
) in self.python_version_to_files.items():
changed_files_string = "\n".join(
sorted(str(file) for file in changed_files_by_version)
)
logger.info(
f"Running pre-commit with Python {python_version} on:\n{changed_files_string}"
)

self.prepare_hooks(dry_run)
if self.all_files:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "demisto-sdk"
version = "1.24.0"
version = "1.25.0"
description = "\"A Python library for the Demisto SDK\""
authors = ["Demisto"]
license = "MIT"
Expand Down

0 comments on commit b748740

Please sign in to comment.