Skip to content

Commit 66c7898

Browse files
authored
Fix two developer-facing annoyances (#9133)
* Fix python ~> python3 in .pre-commit-config.yaml Using plain `python` requires an active virtual environment, but our pre-commit Python scripts don't have any dependencies. It's safe to just use any old python3 that's in the PATH. * Rename `cmake/vcpkg` to `cmake/vcpkg-ports` and update references.
1 parent 23b1f4f commit 66c7898

7 files changed

Lines changed: 5 additions & 5 deletions

File tree

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,13 @@ repos:
116116
hooks:
117117
- id: check-cmake-file-lists
118118
name: check CMake file lists
119-
entry: python tools/check_cmake_file_lists.py
119+
entry: python3 tools/check_cmake_file_lists.py
120120
language: system
121121
files: ^test/.*CMakeLists\.txt$
122122

123123
- id: check-cmake-style
124124
name: check CMake style
125-
entry: python tools/check_cmake_style.py
125+
entry: python3 tools/check_cmake_style.py
126126
language: system
127127
files: (^|/)(CMakeLists\.txt|.*\.cmake)$
128128

doc/CodeStyleCMake.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ After broader approval, third-party dependencies must be consumed with
143143
`find_package`. This also lets packagers and distributors substitute a system or
144144
pre-built copy, rather than forcing every downstream to rebuild dependencies
145145
from source. We use vcpkg in CI to manage our dependencies. If vcpkg lacks a
146-
port, you must write a custom port in `cmake/vcpkg` (for the main Halide build)
147-
or `apps/vcpkg/ports` (for the apps).
146+
port, you must write a custom port in `cmake/vcpkg-ports` (for the main Halide
147+
build) or `apps/vcpkg/ports` (for the apps).
148148

149149
## Prohibited commands list
150150

vcpkg-configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"overlay-ports": [
3-
"cmake/vcpkg"
3+
"cmake/vcpkg-ports"
44
],
55
"overlay-triplets": [
66
"cmake/vcpkg-triplets"

0 commit comments

Comments
 (0)