Skip to content

Commit e114afa

Browse files
authored
Copier update (misc version bumps) (#52)
Pull in upstream template changes <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Chores** * Updated versions for several dependencies and tools, including UV, PNPM, Copier, pytest, and related extensions. * Corrected package and module names for Copier template extensions across configuration and setup files. * Improved logic for dependency setup scripts to better handle conflicting flags. * Added new version keys for additional tools in configuration. * Updated setup instructions in documentation for generating lock files. * Adjusted linting configuration to ignore a specific rule. * Refined formatting in workflow and configuration files. * Updated dependabot configuration to reduce noise from patch update notifications. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
1 parent ad18f25 commit e114afa

File tree

16 files changed

+57
-49
lines changed

16 files changed

+57
-49
lines changed

.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.0.57
2+
_commit: v0.0.60
33
_src_path: gh:LabAutomationAndScreening/copier-base-template.git
44
description: Copier template for creating Python libraries and executables
55
python_ci_versions:

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,5 @@
6161
"initializeCommand": "sh .devcontainer/initialize-command.sh",
6262
"onCreateCommand": "sh .devcontainer/on-create-command.sh",
6363
"postStartCommand": "sh .devcontainer/post-start-command.sh"
64-
// Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): 01ec0f62 # spellchecker:disable-line
64+
// Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): 2b781a57 # spellchecker:disable-line
6565
}

.devcontainer/install-ci-tooling.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import tempfile
88
from pathlib import Path
99

10-
UV_VERSION = "0.7.12"
11-
PNPM_VERSION = "10.13.1"
12-
COPIER_VERSION = "9.7.1"
13-
COPIER_TEMPLATES_EXTENSION_VERSION = "0.3.1"
10+
UV_VERSION = "0.8.3"
11+
PNPM_VERSION = "10.14.0"
12+
COPIER_VERSION = "9.8.0"
13+
COPIER_TEMPLATE_EXTENSIONS_VERSION = "0.3.2"
1414
PRE_COMMIT_VERSION = "4.2.0"
1515
GITHUB_WINDOWS_RUNNER_BIN_PATH = r"C:\Users\runneradmin\.local\bin"
1616
INSTALL_SSM_PLUGIN_BY_DEFAULT = False
@@ -78,7 +78,7 @@ def main():
7878
"install",
7979
f"copier=={COPIER_VERSION}",
8080
"--with",
81-
f"copier-templates-extensions=={COPIER_TEMPLATES_EXTENSION_VERSION}",
81+
f"copier-template-extensions=={COPIER_TEMPLATE_EXTENSIONS_VERSION}",
8282
],
8383
check=True,
8484
env=uv_env,

.devcontainer/manual-setup-deps.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ def main():
5858
is_windows = platform.system() == "Windows"
5959
uv_env = dict(os.environ)
6060
uv_env.update({"UV_PYTHON_PREFERENCE": "only-system", "UV_PYTHON": args.python_version})
61-
skip_check_lock = args.skip_check_lock
62-
if skip_check_lock and args.optionally_check_lock:
61+
skip_check_lock = args.skip_check_lock or args.optionally_check_lock
62+
if args.skip_check_lock and args.optionally_check_lock:
6363
print("Cannot skip and optionally check the lock file at the same time.")
6464
sys.exit(1)
6565

.github/workflows/pre-commit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
if: ${{ github.event_name != 'push' }}
4040
uses: actions/checkout@v4.2.2
4141

42-
- name: Install latest versions of packages
42+
- name: Install latest versions of packages
4343
uses: ./.github/actions/install_deps
4444
with:
4545
python-version: ${{ inputs.python-version }}

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ To create a new repository using this template:
1010
1. Inside that devcontainer, run `python .devcontainer/install-ci-tooling.py` to install necessary tooling to instantiate the template (you can copy/paste the script from this
1111
1. Delete all files currently in the repository. Optional...but makes it easiest to avoid git conflicts.
1212
1. Run copier to instantiate the template: `copier copy --trust gh:LabAutomationAndScreening/copier-python-package-template.git .`
13-
1. Run `uv lock` to generate the lock file
13+
1. Run `python .devcontainer/manual-setup-deps.py --optionally-check-lock` to generate the lock file(s)
14+
1. Stage all files to prepare for commit (`git add .`)
1415
1. Run `python3 .github/workflows/hash_git_files.py . --for-devcontainer-config-update` to update the hash for your devcontainer file
1516
1. Commit the changes (optional)
1617
1. Rebuild your new devcontainer

copier.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ _templates_suffix: .jinja
124124
_exclude:
125125
- "copier.yml"
126126

127-
# adapted from https://github.com/copier-org/copier-templates-extensions#context-hook-extension
127+
# adapted from https://github.com/copier-org/copier-template-extensions#context-hook-extension
128128
_jinja_extensions:
129-
- copier_templates_extensions.TemplateExtensionLoader
129+
- copier_template_extensions.TemplateExtensionLoader
130130
- extensions/context.py:ContextUpdater

extensions/context.py

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
# adapted from https://github.com/copier-org/copier-templates-extensions#context-hook-extension
1+
# adapted from https://github.com/copier-org/copier-template-extensions#context-hook-extension
22
from typing import Any
33
from typing import override
44

5-
from copier_templates_extensions import ContextHook
5+
from copier_template_extensions import ContextHook
66

77

88
class ContextUpdater(ContextHook):
99
update = False
1010

1111
@override
1212
def hook(self, context: dict[Any, Any]) -> dict[Any, Any]:
13-
context["uv_version"] = "0.7.12"
14-
context["pnpm_version"] = "10.13.1"
13+
context["uv_version"] = "0.8.3"
14+
context["pnpm_version"] = "10.14.0"
1515
context["pre_commit_version"] = "4.2.0"
1616
context["pyright_version"] = "1.1.403"
17-
context["pytest_version"] = "8.4.0"
17+
context["pytest_version"] = "8.4.1"
1818
context["pytest_randomly_version"] = "3.16.0"
1919
context["pytest_cov_version"] = "6.2.1"
20-
context["copier_version"] = "9.7.1"
21-
context["copier_templates_extension_version"] = "0.3.1"
20+
context["copier_version"] = "9.8.0"
21+
context["copier_template_extensions_version"] = "0.3.2"
2222
context["sphinx_version"] = "8.1.3"
23-
context["pulumi_version"] = "3.181.0"
24-
context["pulumi_aws_version"] = "6.83.0"
25-
context["pulumi_aws_native_version"] = "1.30.0"
23+
context["pulumi_version"] = "3.186.0"
24+
context["pulumi_aws_version"] = "7.1.0"
25+
context["pulumi_aws_native_version"] = "1.31.0"
2626
context["pulumi_command_version"] = "1.1.0"
27-
context["pulumi_github_version"] = "6.7.2"
27+
context["pulumi_github_version"] = "6.7.3"
2828
context["pulumi_okta_version"] = "4.20.0"
29-
context["boto3_version"] = "1.38.38"
29+
context["boto3_version"] = "1.39.14"
3030
context["ephemeral_pulumi_deploy_version"] = "0.0.4"
3131
context["pydantic_version"] = "2.11.7"
3232
context["pyinstaller_version"] = "6.13.0"
@@ -36,12 +36,14 @@ def hook(self, context: dict[Any, Any]) -> dict[Any, Any]:
3636
context["uvicorn_version"] = "0.35.0"
3737
context["lab_auto_pulumi_version"] = "0.1.15"
3838

39-
context["nuxt_ui_version"] = "^3.1.2"
40-
context["nuxt_version"] = "^3.17.3"
39+
context["nuxt_ui_version"] = "^3.3.0"
40+
context["nuxt_version"] = "^3.18.0"
4141
context["typescript_version"] = "^5.8.2"
42-
context["vue_version"] = "^3.5.13"
43-
context["vue_router_version"] = "^4.5.0"
44-
context["faker_version"] = "^9.8.0"
42+
context["dot_env_cli_version"] = "^9.0.0"
43+
context["playwright_version"] = "^1.52.0"
44+
context["vue_version"] = "^3.5.18"
45+
context["vue_router_version"] = "^4.5.1"
46+
context["faker_version"] = "^9.9.0"
4547
context["graphql_codegen_cli_version"] = "^5.0.5"
4648
context["graphql_codegen_typescript_version"] = "^4.1.6"
4749

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ readme = "README.md"
66
requires-python = ">=3.12.7"
77
dependencies = [
88
# Managed by upstream template
9-
"pytest>=8.4.0",
9+
"pytest>=8.4.1",
1010
"pytest-cov>=6.2.1",
1111
"pytest-randomly>=3.16.0",
1212
"pyright[nodejs]>=1.1.403",
13-
"copier>=9.7.1",
14-
"copier-templates-extensions>=0.3.1"
13+
"copier>=9.8.0",
14+
"copier-template-extensions>=0.3.2"
1515

1616
# Specific to this template
1717

ruff.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ ignore = [
6262
"TD003", # Up to the author's judgement whether a TODO requires a link to an issue or not
6363
"TID252", # Sometimes it makes sense to use relative imports, that's a judgement call for us, not ruff
6464
"TC006", # Adding quotes around classes unnecessarily confuses the IDE for automatic refactoring
65+
"SIM114", # Using `or` statements to simplify this would confuse the coverage checker
6566
]
6667

6768
# Allow fix for all enabled rules (when `--fix`) is provided.

0 commit comments

Comments
 (0)