Skip to content

Commit c415696

Browse files
authored
chore: update pre-commit checks (#925)
Some small updates. --------- Signed-off-by: Henry Schreiner <[email protected]>
1 parent 19b8b00 commit c415696

File tree

12 files changed

+210
-207
lines changed

12 files changed

+210
-207
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242
4343
checks:
4444
name:
45-
🐍 ${{ matrix.python-version }} • CMake ${{ matrix.cmake-version }}
46-
on ${{ matrix.runs-on }}
45+
🐍 ${{ matrix.python-version }} • CMake ${{ matrix.cmake-version }} on ${{
46+
matrix.runs-on }}
4747
runs-on: ${{ matrix.runs-on }}
4848
timeout-minutes: 40
4949
strategy:
@@ -123,7 +123,9 @@ jobs:
123123
if:
124124
matrix.python-version == '3.7' || matrix.python-version == 'pypy-3.8'
125125
|| matrix.python-version == 'pypy-3.7'
126-
run: pip install -e.[test,test-meta,test-numpy,test-schema,wheels,cov,wheel-free-setuptools]
126+
run:
127+
pip install
128+
-e.[test,test-meta,test-numpy,test-schema,wheels,cov,wheel-free-setuptools]
127129

128130
- name: Test package
129131
if: "!contains(matrix.python_version, 'pypy')"

.pre-commit-config.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ repos:
2525
exclude: "^tests"
2626

2727
- repo: https://github.com/astral-sh/ruff-pre-commit
28-
rev: v0.6.8
28+
rev: v0.6.9
2929
hooks:
3030
- id: ruff
3131
args: ["--fix", "--show-fixes"]
@@ -56,8 +56,7 @@ repos:
5656
- id: prettier
5757
types_or: [yaml, markdown, html, css, scss, javascript, json]
5858
args: [--prose-wrap=always]
59-
exclude: "^tests|src/scikit_build_core/resources/scikit-build.schema.json"
60-
stages: [manual]
59+
exclude: "^tests|src/scikit_build_core/resources/scikit-build.schema.json|^docs/projects.md"
6160

6261
- repo: https://github.com/pre-commit/mirrors-mypy
6362
rev: v1.11.2
@@ -91,7 +90,7 @@ repos:
9190
- types-setuptools>=70.1
9291

9392
- repo: https://github.com/henryiii/check-sdist
94-
rev: "v1.0.0rc2"
93+
rev: "v1.0.0"
9594
hooks:
9695
- id: check-sdist
9796
args: [--inject-junk]

docs/build.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -133,22 +133,22 @@ top-level extension is present, then that could be something like
133133
files in it (`METADATA`, `WHEEL`, and `RECORD`), along with license files. There
134134
are a few other metadata files that could be here too, like `entry_points.txt`.
135135

136-
There are also several directories that installers can extract to different locations,
137-
namely:
136+
There are also several directories that installers can extract to different
137+
locations, namely:
138138

139-
* `<package-name>.data/scripts`: Goes to the `/bin` or `/Scripts` directory in
139+
- `<package-name>.data/scripts`: Goes to the `/bin` or `/Scripts` directory in
140140
the environment. Any file starting with `#!python` will get the correct path
141141
injected by the installer. Most build-backends (like setuptools and
142142
scikit-build-core) will convert normal Python shabang lines like
143-
`#!/usr/bin/env python` into `#!python` for you. Though if you are writing Python
144-
and placing them here, it's usually better to use entry points and let the installer
145-
generate the entire file.
146-
* `<package-name>.data/headers`: Goes to the include directory for the current
143+
`#!/usr/bin/env python` into `#!python` for you. Though if you are writing
144+
Python and placing them here, it's usually better to use entry points and let
145+
the installer generate the entire file.
146+
- `<package-name>.data/headers`: Goes to the include directory for the current
147147
version of Python in the environment.
148-
* `<package-name>.data/data`: Goes to the root of the environment.
148+
- `<package-name>.data/data`: Goes to the root of the environment.
149149

150150
Note that if a user is not in a virtual environment, these folders install
151-
directly to the Python install's location, which could be `/` or `/usr`! In
151+
directly to the Python install's location, which could be `/` or `/usr`! In
152152
general, it's best to put data inside the package's folder in site-packages and
153153
then use `importlib.resources` to access it.
154154

@@ -236,7 +236,7 @@ the current workaround).
236236
scikit-build-core.
237237

238238
[repairwheel]: https://github.com/jvolkman/repairwheel
239-
[cibuildwheel]: https://cibuildwheel.readthedocs.io
239+
[cibuildwheel]: https://cibuildwheel.pypa.io
240240
[compatibility tags]: https://packaging.python.org/en/latest/specifications/binary-distribution-format
241241

242242
<!-- prettier-ignore-end -->

docs/changelog.md

Lines changed: 85 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ This version has three fixes related to advanced usages of overrides.
66

77
Fixes:
88

9-
* Avoid modifying the input dict by @henryiii in #903
10-
* Avoid providing prepare-metadata methods if `failed` in overrides by @henryiii in #904
11-
* Support negative envvar values correctly by @henryiii in #907
12-
9+
- Avoid modifying the input dict by @henryiii in #903
10+
- Avoid providing prepare-metadata methods if `failed` in overrides by @henryiii
11+
in #904
12+
- Support negative envvar values correctly by @henryiii in #907
1313

1414
## Version 0.10.6
1515

@@ -21,20 +21,21 @@ downstream nox job is also now a bit better.
2121

2222
Fixes:
2323

24-
* Use correct settings key to remove parts of the version in regex metadata plugin by @philippjh in #887
25-
* Support multiplexed path by @henryiii in #896
26-
* Editable subpackage by @henryiii in #895
27-
* Only strip Release and MinSizeRel builds by default by @henryiii in #898
28-
* Typo in debug message by @LecrisUT in #892
24+
- Use correct settings key to remove parts of the version in regex metadata
25+
plugin by @philippjh in #887
26+
- Support multiplexed path by @henryiii in #896
27+
- Editable subpackage by @henryiii in #895
28+
- Only strip Release and MinSizeRel builds by default by @henryiii in #898
29+
- Typo in debug message by @LecrisUT in #892
2930

3031
Docs:
3132

32-
* Add build info by @henryiii in #878
33-
* Fix typo in `if.platform-system` example by @henryiii in #879
33+
- Add build info by @henryiii in #878
34+
- Fix typo in `if.platform-system` example by @henryiii in #879
3435

3536
CI and testing:
3637

37-
* Packit configuration update by @LecrisUT in #799
38+
- Packit configuration update by @LecrisUT in #799
3839

3940
## Version 0.10.5
4041

@@ -44,24 +45,25 @@ occurs. An issue with a certain style of gitignore was also fixed.
4445

4546
Fixes:
4647

47-
* Automatically refresh the cache when required by @henryiii in #870
48-
* `sdist.exclude` takes precedence over `.gitignore` by @alexreinking in #872
48+
- Automatically refresh the cache when required by @henryiii in #870
49+
- `sdist.exclude` takes precedence over `.gitignore` by @alexreinking in #872
4950

5051
## Version 0.10.4
5152

52-
This version fixes the logic for handling the sysconfig variables on Windows
53-
for the values that used to be only provided on UNIX. This mostly affects
54-
targeting the Stable ABI on Python 3.13. Editable install rebuilds now work if
55-
you have a `wheel.install-dir` set, too.
53+
This version fixes the logic for handling the sysconfig variables on Windows for
54+
the values that used to be only provided on UNIX. This mostly affects targeting
55+
the Stable ABI on Python 3.13. Editable install rebuilds now work if you have a
56+
`wheel.install-dir` set, too.
5657

5758
Fixes:
5859

59-
* Windows 3.13 stable ABI by @LecrisUT in #865
60-
* Editable installs now respect the value of `wheel.install-dir` by @psalvaggio in #867
60+
- Windows 3.13 stable ABI by @LecrisUT in #865
61+
- Editable installs now respect the value of `wheel.install-dir` by @psalvaggio
62+
in #867
6163

6264
Docs:
6365

64-
* Add conda help to faqs by @henryiii in #868
66+
- Add conda help to faqs by @henryiii in #868
6567

6668
## Version 0.10.3
6769

@@ -70,8 +72,7 @@ for Python \<3.14 when reading gitignores with special characters.
7072

7173
Fixes:
7274

73-
* Make sure encoding is specified in more places by @henryiii in #861
74-
75+
- Make sure encoding is specified in more places by @henryiii in #861
7576

7677
## Version 0.10.2
7778

@@ -80,70 +81,74 @@ sdist would get included twice, affecting some tools (like uv).
8081

8182
Fixes:
8283

83-
* Files included twice when they match `include_spec` by @abetlen in #857
84+
- Files included twice when they match `include_spec` by @abetlen in #857
8485

8586
## Version 0.10.1
8687

8788
This is a quick fix release with two patches for specific situations.
8889

8990
Fixes:
9091

91-
* Fix crash when building inside a submodule by @ausbin in #854
92-
* `cmake.minimum-version` logic issue by @henryiii in #853
92+
- Fix crash when building inside a submodule by @ausbin in #854
93+
- `cmake.minimum-version` logic issue by @henryiii in #853
9394

9495
## Version 0.10.0
9596

9697
This version adds auto CMake version discovery, opt-in auto minimum-version,
9798
rebuild on failure support, quite a few new override options greatly expanding
9899
the static config options for builds, more powerful regexs, and more.
99100

100-
Also see [the announcement post](https://iscinumpy.dev/post/scikit-build-core-0-10).
101+
Also see
102+
[the announcement post](https://iscinumpy.dev/post/scikit-build-core-0-10).
101103

102104
New features:
103105

104-
* Auto CMake version by @henryiii in #804
105-
* Auto minimum-version by @henryiii in #798
106-
* Add `fail` setting to instant-fail build by @henryiii in #824
107-
* Add messages config for failure/success by @henryiii in #825
108-
* New color system for message config by @henryiii in #842
109-
* Add `if.abi-flags` (for free-threaded) by @henryiii in #819
110-
* Adding `if.system-cmake` and `if.cmake-wheel` by @henryiii in #826
111-
* Add `if.from-sdist` for overrides by @henryiii in #812
112-
* Add `if.failed` (retry) by @henryiii in #820
113-
* Add `if.scikit-build-version` by @henryiii in #851
114-
* Packages can also be specified via a table by @henryiii in #841
115-
* Move `cmake.targets` and `cmake.verbose` to `build.targets` and `build.verbose` by @henryiii in #793
116-
* Support multipart regex using `result=` by @henryiii in #818
117-
* Add `remove=` postprocess to regex by @henryiii in #828
106+
- Auto CMake version by @henryiii in #804
107+
- Auto minimum-version by @henryiii in #798
108+
- Add `fail` setting to instant-fail build by @henryiii in #824
109+
- Add messages config for failure/success by @henryiii in #825
110+
- New color system for message config by @henryiii in #842
111+
- Add `if.abi-flags` (for free-threaded) by @henryiii in #819
112+
- Adding `if.system-cmake` and `if.cmake-wheel` by @henryiii in #826
113+
- Add `if.from-sdist` for overrides by @henryiii in #812
114+
- Add `if.failed` (retry) by @henryiii in #820
115+
- Add `if.scikit-build-version` by @henryiii in #851
116+
- Packages can also be specified via a table by @henryiii in #841
117+
- Move `cmake.targets` and `cmake.verbose` to `build.targets` and
118+
`build.verbose` by @henryiii in #793
119+
- Support multipart regex using `result=` by @henryiii in #818
120+
- Add `remove=` postprocess to regex by @henryiii in #828
118121

119122
Fixes:
120123

121-
* Warn if cmake/ninja in build system requirements by @henryiii in #803
122-
* Detect manual generator setting for `get_requires_*` by @henryiii in #840
123-
* Support nested and local gitignores by @henryiii in #827
124+
- Warn if cmake/ninja in build system requirements by @henryiii in #803
125+
- Detect manual generator setting for `get_requires_*` by @henryiii in #840
126+
- Support nested and local gitignores by @henryiii in #827
124127

125128
Tests:
126129

127-
* Fix `test_cmake_config` if `CMAKE_GENERATOR` is already set by @lorepirri in #847
130+
- Fix `test_cmake_config` if `CMAKE_GENERATOR` is already set by @lorepirri in
131+
#847
128132

129133
Internal:
130134

131-
* Pull out overrides to separate file by @henryiii in #821
132-
* Nicer error/warning printer by @henryiii in #813
133-
* Speed up CI for format job by @henryiii in #814
134-
* Avoid old wheel warning in CI test job by @henryiii in #849
135+
- Pull out overrides to separate file by @henryiii in #821
136+
- Nicer error/warning printer by @henryiii in #813
137+
- Speed up CI for format job by @henryiii in #814
138+
- Avoid old wheel warning in CI test job by @henryiii in #849
135139

136140
Documentation:
137141

138-
* Fix typo in projects list by @jcfr in #797
139-
* Add disclaimer by @henryiii in #805
140-
* Add pointer to itk by @thewtex in #817
141-
* Add projects list by @henryiii in #788
142-
* Examples nox job should use local copy of scikit-build-core by @henryiii in #810
143-
* Expand defs and move schema by @henryiii in #795
144-
* Hide deprecated options in README by @henryiii in #792
145-
* Move overrides to page, expand by @henryiii in #815
146-
* Use modern cmake/ninja version setting in Fortran example by @henryiii in #809
142+
- Fix typo in projects list by @jcfr in #797
143+
- Add disclaimer by @henryiii in #805
144+
- Add pointer to itk by @thewtex in #817
145+
- Add projects list by @henryiii in #788
146+
- Examples nox job should use local copy of scikit-build-core by @henryiii in
147+
#810
148+
- Expand defs and move schema by @henryiii in #795
149+
- Hide deprecated options in README by @henryiii in #792
150+
- Move overrides to page, expand by @henryiii in #815
151+
- Use modern cmake/ninja version setting in Fortran example by @henryiii in #809
147152

148153
## Version 0.9.10
149154

@@ -152,7 +157,8 @@ This release backports a couple of fixes made during work towards 0.10.
152157
Fixes:
153158

154159
- Regression for `'-'` in version name by @henryiii in #834
155-
- Improve version regex to capture typed version attributes by @maxbachmann in #816
160+
- Improve version regex to capture typed version attributes by @maxbachmann in
161+
#816
156162

157163
## Version 0.9.9
158164

@@ -162,7 +168,8 @@ Fixes:
162168

163169
- Strip epoch from `SKBUILD_PROJECT_VERSION` by @henryiii in #829
164170

165-
**Full Changelog**: https://github.com/scikit-build/scikit-build-core/compare/v0.9.8...v0.9.9
171+
**Full Changelog**:
172+
https://github.com/scikit-build/scikit-build-core/compare/v0.9.8...v0.9.9
166173

167174
## Version 0.9.8
168175

@@ -174,13 +181,16 @@ anti-pattern, but we can set that variable too. More tests now run on Python
174181

175182
Fixes:
176183

177-
* Empty build arguments for some targets in multi-target build by @junrushao in #784
178-
* Support packages that hardcode `CMAKE_INSTALL_PREFIX` in their `install` commands by @henryiii in #786
179-
* Logger shouldn't warn for missing lib on UNIX by @henryiii in #787
184+
- Empty build arguments for some targets in multi-target build by @junrushao in
185+
#784
186+
- Support packages that hardcode `CMAKE_INSTALL_PREFIX` in their `install`
187+
commands by @henryiii in #786
188+
- Logger shouldn't warn for missing lib on UNIX by @henryiii in #787
180189

181190
Tests:
182191

183-
* Use `ZipFile` instead of `zipfile.Path` to enable more tests on Python 3.7 by @henryiii in #785
192+
- Use `ZipFile` instead of `zipfile.Path` to enable more tests on Python 3.7 by
193+
@henryiii in #785
184194

185195
## Version 0.9.7
186196

@@ -190,15 +200,16 @@ correct tags on MUSL. And releases now have Attestations on GitHub at
190200

191201
Fixes:
192202

193-
* Set `CC` and `CXX` from sysconfig if not set by @henryiii in #782
194-
* `musllinux` tag incorrect by @henryiii in #773
195-
* Logger unconditionally set to `DEBUG` in non-PEP 517 usage by @henryiii in #779
203+
- Set `CC` and `CXX` from sysconfig if not set by @henryiii in #782
204+
- `musllinux` tag incorrect by @henryiii in #773
205+
- Logger unconditionally set to `DEBUG` in non-PEP 517 usage by @henryiii in
206+
#779
196207

197208
Documentation:
198209

199-
* Fix Fortran example by @henryiii in #771
200-
* Fix typo in skbuild soabi docs by @henryiii in #775
201-
* Fortran and Cython updates by @henryiii in #781
210+
- Fix Fortran example by @henryiii in #771
211+
- Fix typo in skbuild soabi docs by @henryiii in #775
212+
- Fortran and Cython updates by @henryiii in #781
202213

203214
## Version 0.9.6
204215

@@ -207,9 +218,10 @@ affecting other setuptools plugins.
207218

208219
Fixes:
209220

210-
* Improve error message when `metadata.version.provider` not set by @thewtex in #762
211-
* Only inject logic if `cmake_*` keywords present by @kiwifb in #768
212-
* Only replace color tags if the color is defined by @bnavigator in #764
221+
- Improve error message when `metadata.version.provider` not set by @thewtex in
222+
#762
223+
- Only inject logic if `cmake_*` keywords present by @kiwifb in #768
224+
- Only replace color tags if the color is defined by @bnavigator in #764
213225

214226
## Version 0.9.5
215227

0 commit comments

Comments
 (0)