Skip to content

Commit 9d15a06

Browse files
committed
cruft: update
- Bump pre-commit hook `ruff` to v0.15.12 and pin `ruff` dev dependency to 0.15.11; bump `mypy` to 1.20.1 and `ty` to 0.0.31. - Bump production dependency `niquests` to 3.18.6. - Downgrade `cspell` to `^9.8.0` and drop `numpydoc` (and the matching dictionary entry) and `docutils<0.22` from the docs group. - Add `man` to the hatch sdist include list and tighten yapf's `ignore_patterns` (`.venv`, `.wiswa-ci`, `node_modules`). - Add `*.min.js` to `.prettierignore` and bump `CITATION.cff` release date. - Re-flow `.claude/agents/release.md` and `.claude/agents/wiswa-sync.md` via prettier. - Restrict supported platforms to Linux and macOS in `.wiswa.jsonnet`, dropping the Windows matrix rows, signing, and zip steps from the PyInstaller workflow and removing the now-unused `lastexitcode` and `signtool` dictionary entries. - Refresh `uv.lock` and `yarn.lock`. Signed-off-by: Andrew Udvare <audvare@gmail.com>
1 parent 833a3ee commit 9d15a06

12 files changed

Lines changed: 354 additions & 326 deletions

File tree

.claude/agents/release.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ with the changelog.
6969
`line 2` reads as `- item with long sentence line 2`. Do **not** join across a paragraph
7070
break: leave any run of **two or more consecutive newlines** (`\n\n` or more) unchanged.
7171
- **Full Changelog line:** After the body, append **one blank line**, then exactly:
72-
`**Full Changelog**: https://github.com/Tatsh/mkwineprefix/compare/vPREV...vNEW` where
73-
`vNEW` is this release's tag. Set `vPREV` to the tag of the
72+
`**Full Changelog**: https://github.com/Tatsh/mkwineprefix/compare/vPREV...vNEW`
73+
where `vNEW` is this release's tag. Set `vPREV` to the tag of the
7474
**most recent other GitHub release** (for example from `gh release list`, ordered by recency,
7575
skipping `vNEW`). If no earlier release exists on GitHub, fall back to the previous version
7676
in `CHANGELOG.md` immediately below this entry, or the git tag that precedes `vNEW`.

.claude/agents/wiswa-sync.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ Reflects changes made to Wiswa-managed files back into `.wiswa.jsonnet`.
55
## Role
66

77
When a managed file is modified directly (e.g. `uv add`, manual
8-
`pyproject.toml` edits, etc.), you update `.wiswa.jsonnet` so that running Wiswa
8+
`pyproject.toml` edits, etc.), you
9+
update `.wiswa.jsonnet` so that running Wiswa
910
again would produce the same result.
1011

1112
## Context

.github/workflows/pyinstaller.yml

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
jobs:
22
build:
33
env:
4-
WINDOWS_SIGNING_CERT: ${{ secrets.WINDOWS_SIGNING_CERTIFICATE }}
54
APPLE_SIGNING_CERT: ${{ secrets.APPLE_SIGNING_CERTIFICATE }}
65
runs-on: ${{ matrix.os }}
76
steps:
@@ -77,36 +76,6 @@ jobs:
7776
fi
7877
done < <(tomlq -r '.project.scripts|to_entries[]|"\(.key) \(.value|split(":")|join(" "))"' pyproject.toml)
7978
shell: 'bash'
80-
- if: (matrix.os == 'windows-latest' || matrix.os == 'windows-11-arm') && env.WINDOWS_SIGNING_CERT != ''
81-
name: 'Sign Windows binaries'
82-
env:
83-
SIGNING_CERT_BASE64: ${{ secrets.WINDOWS_SIGNING_CERTIFICATE }}
84-
SIGNING_PASSWORD: ${{ secrets.WINDOWS_SIGNING_PASSWORD }}
85-
TIMESTAMP_URL: ${{ secrets.WINDOWS_TIMESTAMP_URL }}
86-
run: |
87-
$certBytes = [Convert]::FromBase64String($env:SIGNING_CERT_BASE64)
88-
$certPath = Join-Path $env:RUNNER_TEMP 'cert.pfx'
89-
[IO.File]::WriteAllBytes($certPath, $certBytes)
90-
$timestampArgs = @()
91-
if ($env:TIMESTAMP_URL) {
92-
$timestampArgs = @('/tr', $env:TIMESTAMP_URL, '/td', 'sha256')
93-
}
94-
foreach ($exe in (Get-ChildItem -Path dist\*.exe)) {
95-
Write-Host "Signing '$($exe.Name)'..."
96-
& signtool sign /f $certPath /p $env:SIGNING_PASSWORD @timestampArgs /fd sha256 $exe.FullName
97-
if ($LASTEXITCODE -ne 0) { throw "signtool failed for $($exe.Name)" }
98-
}
99-
Remove-Item $certPath
100-
shell: 'pwsh'
101-
- if: matrix.os == 'windows-latest' || matrix.os == 'windows-11-arm'
102-
name: 'Test binary'
103-
run: |
104-
$distFiles = Get-ChildItem -Path dist\*.exe
105-
Write-Host "Found $($distFiles.Count) files in dist/: $(( $distFiles | ForEach-Object { $_.Name } ) -join ', ')"
106-
foreach ($file in $distFiles) {
107-
Write-Host "Testing '$($file.FullName)'."
108-
& $file.FullName --help
109-
}
11079
- if: (matrix.os == 'macos-latest' || matrix.os == 'macos-15-intel') && env.APPLE_SIGNING_CERT != ''
11180
name: 'Sign and notarise macOS binaries'
11281
env:
@@ -194,13 +163,6 @@ jobs:
194163
rm -fR _out
195164
mkdir _out
196165
zip -j _out/mkwineprefix-${{ github.ref_name }}-${{ matrix.suffix }}.zip ${{ matrix.dist_path }}
197-
- if: (matrix.os == 'windows-latest' || matrix.os == 'windows-11-arm') && github.ref_type == 'tag'
198-
name: 'Zip files'
199-
run: |
200-
Remove-Item -Force _out -ErrorAction Continue
201-
New-Item -ItemType Directory -Name _out
202-
Compress-Archive -Path ${{ matrix.dist_path }} -DestinationPath _out/mkwineprefix-${{ github.ref_name }}-${{ matrix.suffix }}.zip
203-
shell: pwsh
204166
- if: github.ref_type == 'tag'
205167
name: 'Attest'
206168
uses: 'actions/attest@v4.1.0'
@@ -229,12 +191,6 @@ jobs:
229191
- os: 'macos-latest'
230192
dist_path: 'dist/*'
231193
suffix: 'mac-arm64'
232-
- os: 'windows-latest'
233-
dist_path: 'dist/*.exe'
234-
suffix: 'win-x86_64'
235-
- os: 'windows-11-arm'
236-
dist_path: 'dist/*.exe'
237-
suffix: 'win-arm64'
238194
name: 'PyInstaller'
239195
'on':
240196
push:

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ repos:
4949
- '--fix'
5050
id: 'ruff-check'
5151
repo: 'https://github.com/astral-sh/ruff-pre-commit'
52-
rev: 'v0.15.11'
52+
rev: 'v0.15.12'
5353
- hooks:
5454
- id: 'yapf'
5555
name: 'check Python files are formatted'

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*.libsonnet
66
*.lock
77
*.log
8+
*.min.js
89
*~
910
.*.swp
1011
.*_cache/

.vscode/dictionary.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ jinja
6565
jsonnet
6666
jsonschema
6767
kwargs
68-
lastexitcode
6968
lastrowid
7069
launchable
7170
lextudio
@@ -91,7 +90,6 @@ notarytool
9190
noto
9291
npmjs
9392
numpy
94-
numpydoc
9593
nvapi
9694
nvcuda
9795
nvcuvid
@@ -130,7 +128,6 @@ segoe
130128
setattr
131129
shellcheck
132130
shellformat
133-
signtool
134131
snapcore
135132
snapcraft
136133
softprops

.wiswa.jsonnet

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ local utils = import 'utils.libjsonnet';
33
{
44
uses_user_defaults: true,
55
description: 'Create a Wine prefix with custom settings.',
6+
supported_platforms: ['linux', 'macos'],
67
keywords: ['command line', 'dxvk', 'nvapi', 'wine', 'wine prefix'],
78
project_name: 'mkwineprefix',
89
version: '0.1.0',

CITATION.cff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ authors:
22
- family-names: 'Udvare'
33
given-names: 'Andrew'
44
cff-version: '1.2.0'
5-
date-released: '2026-04-20'
5+
date-released: '2026-04-27'
66
message: 'If you use this software, please cite it as below.'
77
title: 'mkwineprefix'
88
version: '0.1.0'

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"description": "Create a Wine prefix with custom settings.",
3838
"devDependencies": {
3939
"@prettier/plugin-xml": "^3.4.2",
40-
"cspell": "^10.0.0",
40+
"cspell": "^9.8.0",
4141
"markdownlint-cli2": "^0.22.0",
4242
"prettier": "^3.8.3",
4343
"prettier-plugin-ini": "^1.3.0",

pyproject.toml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@ requires = ["hatchling"]
66
dev = [
77
"commitizen>=4.13.10",
88
"cz-path>=0.0.6",
9-
"mypy>=1.20.0",
10-
"ruff>=0.15.10",
11-
"ty>=0.0.29",
9+
"mypy>=1.20.1",
10+
"ruff==0.15.11",
11+
"ty>=0.0.31",
1212
"yapf>=0.43.0",
1313
]
1414
docs = [
1515
"autodoc-pydantic>=2.2.0",
1616
"doc8>=2.0.0",
17-
"docutils<0.22",
1817
"enum-tools[sphinx]>=0.13.0",
1918
"esbonio>=2.0.0",
20-
"numpydoc>=1.10.0",
2119
"restructuredtext-lint>=2.0.2",
2220
"sphinx-click>=6.2.0",
2321
"sphinx-datatables>=1.0.0",
@@ -50,7 +48,7 @@ dependencies = [
5048
"anyio>=4.13.0",
5149
"bascom>=0.1.2",
5250
"click>=8.3.2",
53-
"niquests>=3.18.5",
51+
"niquests>=3.18.6",
5452
"platformdirs>=4.9.6",
5553
"python-xz>=0.6.0",
5654
"typing-extensions>=4.15.0",
@@ -119,7 +117,7 @@ omit = [
119117
max-line-length = 100
120118

121119
[tool.hatch.build.targets.sdist]
122-
include = ["mkwineprefix", "tests"]
120+
include = ["mkwineprefix", "man", "tests"]
123121

124122
[tool.hatch.build.targets.wheel]
125123
packages = ["mkwineprefix"]
@@ -263,4 +261,4 @@ split_penalty_logical_operator = 300
263261
use_tabs = false
264262

265263
[tool.yapfignore]
266-
ignore_patterns = [".venv/**", "node_modules/**"]
264+
ignore_patterns = [".venv", ".wiswa-ci", "node_modules"]

0 commit comments

Comments
 (0)