Skip to content

Commit 1ff6a2a

Browse files
ejfineejfine
committed
more updates
1 parent d2c7574 commit 1ff6a2a

8 files changed

Lines changed: 27 additions & 16 deletions

File tree

‎.config/.copier-answers.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier
2-
_commit: v0.1.7-1-g74f764a1
2+
_commit: v0.1.9
33
_src_path: gh:LabAutomationAndScreening/copier-base-template.git
44
copier_answers_directory: .config
55
description: Copier template for creating Python libraries and executables

‎.devcontainer/devcontainer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
"extensions": [
2323
// basic tooling
2424
// "eamodio.gitlens@15.5.1",
25-
"coderabbit.coderabbit-vscode@0.21.8",
25+
"coderabbit.coderabbit-vscode@0.21.9",
2626
"ms-vscode.live-server@0.5.2025051301",
2727
"MS-vsliveshare.vsliveshare@1.0.5905",
28-
"anthropic.claude-code@2.1.278",
28+
"anthropic.claude-code@2.1.283",
2929

3030
// Python
3131
"-ms-python.vscode-pylance", // pyrefly is the language server for this project; ms-python.python auto-installs Pylance via its extension pack, and Pylance then warns on every boot that it's disabled
3232
"ms-python.python@2026.5.2026052901",
3333
"meta.pyrefly@1.3.1",
3434
"ms-vscode-remote.remote-containers@0.414.0",
35-
"charliermarsh.ruff@2026.68.0",
35+
"charliermarsh.ruff@2026.84.0",
3636

3737
// Misc file formats
3838
"bierner.markdown-mermaid@1.29.0",
@@ -67,5 +67,5 @@
6767
"initializeCommand": "sh .devcontainer/initialize-command.sh",
6868
"onCreateCommand": "sh .devcontainer/on-create-command.sh",
6969
"postStartCommand": "sh .devcontainer/post-start-command.sh"
70-
// Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): 6b104ca4 # spellchecker:disable-line
70+
// Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): 6950b8fc # spellchecker:disable-line
7171
}

‎.devcontainer/install-ci-tooling.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
PNPM_VERSION = "12.4.2"
1919
COPIER_VERSION = "==9.18.2"
2020
COPIER_TEMPLATE_EXTENSIONS_VERSION = "==0.3.3"
21-
PRE_COMMIT_VERSION = "4.6.2"
22-
TASK_VERSION = "3.53.1"
21+
PRE_COMMIT_VERSION = "==4.6.2"
22+
# identify decides which files each pre-commit hook runs on, so a floating version silently changes what CI checks
23+
IDENTIFY_VERSION = "==2.6.20"
24+
TASK_VERSION = "==3.53.1"
2325
DOWNLOAD_TIMEOUT_SECONDS = 90
2426
# Where uv places both itself and the executables of the tools it installs. Resolves from USERPROFILE
2527
# on Windows, so it matches the runner's home directory without assuming its user name. Already on
@@ -112,7 +114,7 @@ def install_task(uv_path: str, uv_env: dict[str, str], *, is_windows: bool) -> N
112114
"""
113115
LOCAL_BIN_DIR.mkdir(parents=True, exist_ok=True)
114116
_ = subprocess.run( # noqa: S603 # this is all our own input
115-
[uv_path, "tool", "install", f"go-task-bin=={TASK_VERSION}"],
117+
[uv_path, "tool", "install", f"go-task-bin{TASK_VERSION}"],
116118
check=True,
117119
env=uv_env,
118120
timeout=DOWNLOAD_TIMEOUT_SECONDS,
@@ -272,7 +274,9 @@ def main():
272274
uv_path,
273275
"tool",
274276
"install",
275-
f"pre-commit=={PRE_COMMIT_VERSION}",
277+
f"pre-commit{PRE_COMMIT_VERSION}",
278+
"--with",
279+
f"identify{IDENTIFY_VERSION}",
276280
],
277281
check=True,
278282
env=uv_env,

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ repos:
136136
.*/__snapshots__/.*|
137137
.*/vendor_files/.*|
138138
.*\.svg|
139+
.*\.wxs| # formatter sorts attributes and joins multi-line ones, making the Windows installer files hard to read
139140
)$
140141
141142
# Invalid File Checks

‎extensions/context.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ def hook( # noqa: PLR0915 # yes, this is a lot of statements, but it's all just
2323
context["pnpm_version"] = "12.4.2"
2424
context["npm_version"] = "11.13.0"
2525
context["nvm_version"] = "0.40.5"
26-
context["pre_commit_version"] = "4.6.2"
27-
context["task_version"] = "3.53.1"
26+
context["pre_commit_version"] = "==4.6.2"
27+
context["identify_version"] = "==2.6.20"
28+
context["task_version"] = "==3.53.1"
2829
context["pytest_version"] = ">=9.1.1"
2930
context["pytest_randomly_version"] = ">=5.0.0"
3031
context["pytest_cov_version"] = ">=7.1.0"

‎template/.devcontainer/devcontainer.json.jinja‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@
3434
"-AmazonWebServices.aws-toolkit-vscode", // the AWS CLI feature installs this automatically, but it's causing problems in VS Code{% endraw %}{% endif %}{% raw %}
3535
// basic tooling
3636
// "eamodio.gitlens@15.5.1",
37-
"coderabbit.coderabbit-vscode@0.21.8",
37+
"coderabbit.coderabbit-vscode@0.21.9",
3838
"ms-vscode.live-server@0.5.2025051301",
3939
"MS-vsliveshare.vsliveshare@1.0.5905",{% endraw %}{% if install_claude_cli %}{% raw %}
40-
"anthropic.claude-code@2.1.278",{% endraw %}{% endif %}{% raw %}{% endraw %}{% if (is_child_of_copier_base_template is defined and is_child_of_copier_base_template is sameas(true)) or (is_child_of_copier_base_template is not defined and template_uses_python is defined and template_uses_python is sameas(true)) %}{% raw %}
40+
"anthropic.claude-code@2.1.283",{% endraw %}{% endif %}{% raw %}{% endraw %}{% if (is_child_of_copier_base_template is defined and is_child_of_copier_base_template is sameas(true)) or (is_child_of_copier_base_template is not defined and template_uses_python is defined and template_uses_python is sameas(true)) %}{% raw %}
4141

4242
// Python
4343
"-ms-python.vscode-pylance", // pyrefly is the language server for this project; ms-python.python auto-installs Pylance via its extension pack, and Pylance then warns on every boot that it's disabled
4444
"ms-python.python@2026.5.2026052901",
4545
"meta.pyrefly@1.3.1",
4646
"ms-vscode-remote.remote-containers@0.414.0",
47-
"charliermarsh.ruff@2026.68.0",{% endraw %}{% endif %}{% raw %}
47+
"charliermarsh.ruff@2026.84.0",{% endraw %}{% endif %}{% raw %}
4848
{% endraw %}{% if is_child_of_copier_base_template is not defined and template_uses_vuejs is defined and template_uses_vuejs is sameas(true) %}{% raw %}
4949
// VueJS
5050
"vue.volar@3.2.5",

‎template/.devcontainer/install-ci-tooling.py.jinja‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ PNPM_VERSION = "{% endraw %}{{ pnpm_version }}{% raw %}"
1212
COPIER_VERSION = "{% endraw %}{{ copier_version }}{% raw %}"
1313
COPIER_TEMPLATE_EXTENSIONS_VERSION = "{% endraw %}{{ copier_template_extensions_version }}{% raw %}"
1414
PRE_COMMIT_VERSION = "{% endraw %}{{ pre_commit_version }}{% raw %}"
15+
# identify decides which files each pre-commit hook runs on, so a floating version silently changes what CI checks
16+
IDENTIFY_VERSION = "{% endraw %}{{ identify_version }}{% raw %}"
1517
TASK_VERSION = "{% endraw %}{{ task_version }}{% raw %}"
1618
DOWNLOAD_TIMEOUT_SECONDS = 90
1719
# Where uv places both itself and the executables of the tools it installs. Resolves from USERPROFILE
@@ -105,7 +107,7 @@ def install_task(uv_path: str, uv_env: dict[str, str], *, is_windows: bool) -> N
105107
"""
106108
LOCAL_BIN_DIR.mkdir(parents=True, exist_ok=True)
107109
_ = subprocess.run( # noqa: S603 # this is all our own input
108-
[uv_path, "tool", "install", f"go-task-bin=={TASK_VERSION}"],
110+
[uv_path, "tool", "install", f"go-task-bin{TASK_VERSION}"],
109111
check=True,
110112
env=uv_env,
111113
timeout=DOWNLOAD_TIMEOUT_SECONDS,
@@ -265,7 +267,9 @@ def main():
265267
uv_path,
266268
"tool",
267269
"install",
268-
f"pre-commit=={PRE_COMMIT_VERSION}",
270+
f"pre-commit{PRE_COMMIT_VERSION}",
271+
"--with",
272+
f"identify{IDENTIFY_VERSION}",
269273
],
270274
check=True,
271275
env=uv_env,

‎template/.pre-commit-config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ repos:
136136
.*/__snapshots__/.*|
137137
.*/vendor_files/.*|
138138
.*\.svg|
139+
.*\.wxs| # formatter sorts attributes and joins multi-line ones, making the Windows installer files hard to read
139140
)$
140141
141142
# Invalid File Checks

0 commit comments

Comments
 (0)