diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-04-19 13:31:45 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-04-19 13:32:50 +0000 |
| commit | 849a376de96a2a65422d67a0b41c2f782af7abf5 (patch) | |
| tree | 4d3cc11b4432f24b8e33bf339c80de6ccd316530 | |
| parent | Releasing debian version 2.12.0-1. (diff) | |
| download | pre-commit-849a376de96a2a65422d67a0b41c2f782af7abf5.tar.xz pre-commit-849a376de96a2a65422d67a0b41c2f782af7abf5.zip | |
Merging upstream version 2.12.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | .pre-commit-config.yaml | 4 | ||||
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | pre_commit/staged_files_only.py | 2 | ||||
| -rw-r--r-- | setup.cfg | 2 |
5 files changed, 13 insertions, 5 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0c6d636..214c285 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,11 +21,11 @@ repos: hooks: - id: autopep8 - repo: https://github.com/pre-commit/pre-commit - rev: v2.12.0 + rev: v2.12.1 hooks: - id: validate_manifest - repo: https://github.com/asottile/pyupgrade - rev: v2.11.0 + rev: v2.12.0 hooks: - id: pyupgrade args: [--py36-plus] diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d6a35d..2f154c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +2.12.1 - 2021-04-16 +=================== + +### Fixes +- Fix race condition when stashing files in multiple parallel invocations + - #1881 PR by @adamchainz. + - #1880 issue by @adamchainz. + 2.12.0 - 2021-04-06 =================== diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 34ace23..58dee74 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,7 +10,7 @@ resources: type: github endpoint: github name: asottile/azure-pipeline-templates - ref: refs/tags/v2.0.0 + ref: refs/tags/v2.1.0 jobs: - template: job--python-tox.yml@asottile diff --git a/pre_commit/staged_files_only.py b/pre_commit/staged_files_only.py index 6179301..48cc102 100644 --- a/pre_commit/staged_files_only.py +++ b/pre_commit/staged_files_only.py @@ -47,7 +47,7 @@ def _unstaged_changes_cleared(patch_dir: str) -> Generator[None, None, None]: retcode=None, ) if retcode and diff_stdout_binary.strip(): - patch_filename = f'patch{int(time.time())}' + patch_filename = f'patch{int(time.time())}-{os.getpid()}' patch_filename = os.path.join(patch_dir, patch_filename) logger.warning('Unstaged files detected.') logger.info(f'Stashing unstaged files to {patch_filename}.') @@ -1,6 +1,6 @@ [metadata] name = pre_commit -version = 2.12.0 +version = 2.12.1 description = A framework for managing and maintaining multi-language pre-commit hooks. long_description = file: README.md long_description_content_type = text/markdown |