Refactored clang version check into a python script. #1471
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… crashes on win32.
tigercosmos
reviewed
Jun 25, 2024
ci/check-clang-format-version.py
Outdated
|
|
||
|
|
||
| def main(): | ||
| result = subprocess.run("clang-format --version", capture_output=True) |
There was a problem hiding this comment.
subprocess.run(["clang-format", "--version"]...
tigercosmos
reviewed
Jun 25, 2024
.pre-commit-config.yaml
Outdated
| @@ -5,8 +5,8 @@ repos: | |||
| hooks: | |||
| - id: check-clang-format-version | |||
| name: Check clang-format version | |||
| entry: ./ci/check-clang-format-version.sh | |||
| language: script | |||
| entry: python ./ci/check-clang-format-version.py | |||
There was a problem hiding this comment.
explicitly use Python3?
There was a problem hiding this comment.
Sure. subprocess.run is not supported pre python 3.5 anyway.
seladb
reviewed
Jun 25, 2024
ci/check-clang-format-version.py
Outdated
Comment on lines
12
to
15
| print( | ||
| f"Error: Found clang-format version {version_str}, but {EXPECTED_CLANG_VERSION} is required." | ||
| ) | ||
| exit(1) |
There was a problem hiding this comment.
In python the convention is to throw an exception. It's exit value is 1:
raise ValueError(f"Error: Found clang-format version {version_str}, but {EXPECTED_CLANG_VERSION} is required.")
ci/check-clang-format-version.py
Outdated
| exit(1) | ||
|
|
||
| print("Clang format version satisfied.") | ||
| exit(0) |
There was a problem hiding this comment.
This line is not needed. The default exit value is 0
seladb
approved these changes
Jun 25, 2024
ci/check-clang-format-version.py
Outdated
| result = subprocess.run(("clang-format", "--version"), capture_output=True) | ||
| result.check_returncode() | ||
|
|
||
| version_str = result.stdout.decode("utf-8").split(" ")[2].strip() |
There was a problem hiding this comment.
nit: the default split character is space, so you can just do: .split()
There was a problem hiding this comment.
Thanks. Updated in de4d3d8
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1470
The PR changes the clang version check script from a bash script to a python script. The idea is that since pre-commit is a python package, the system running it will (hopefully) have a system-wide python interpreter installed and can run the checker script regardless of the OS.