Skip to content

Commit 2eed33e

Browse files
authored
Copier update (dependabot) (#20)
Pull in upstream changes
1 parent f0c3746 commit 2eed33e

File tree

16 files changed

+164
-27
lines changed

16 files changed

+164
-27
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.32
2+
_commit: v0.0.36
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"ruff.nativeServer": "on",
5050
// TODO: see if there's a way to specify different configurations for different folders
5151
"ruff.configuration": "/workspaces/copier-python-package-template/ruff-test.toml", // use the test configuration since it's less restrictive and won't show false positives and underline things
52-
"[jsonc][json][javascript][typescript][graphql]": {
52+
"[jsonc][json][javascript][typescript][graphql][css][scss][html][vue]": {
5353
"editor.defaultFormatter": "esbenp.prettier-vscode",
5454
"editor.formatOnSave": true
5555
}
@@ -59,5 +59,5 @@
5959
"initializeCommand": "sh .devcontainer/initialize-command.sh",
6060
"onCreateCommand": "sh .devcontainer/on-create-command.sh",
6161
"postStartCommand": "sh .devcontainer/post-start-command.sh"
62-
// Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): 2308a2ae # spellchecker:disable-line
62+
// Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): 53debcd8 # spellchecker:disable-line
6363
}

.devcontainer/install-ci-tooling.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ curl -LsSf https://astral.sh/uv/0.6.17/install.sh | sh
1010
uv --version
1111
# TODO: add uv autocompletion to the shell https://docs.astral.sh/uv/getting-started/installation/#shell-autocompletion
1212

13-
# Ensure that uv won't use the default system Python
14-
default_version="3.12.7"
13+
# Set to the system version of Python3 by default
14+
default_version=$(python3 -c "import sys; print ('.'.join((str(x) for x in sys.version_info[:3])))")
1515

1616
# Use the input argument if provided, otherwise use the default value
1717
input="${1:-$default_version}"

.github/actions/install_deps_uv/install-ci-tooling.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if ($args.Count -eq 0) {
2121
}
2222

2323

24-
$env:UV_PYTHON = "$input"
24+
$env:UV_PYTHON = "$input_arg"
2525
$env:UV_PYTHON_PREFERENCE="only-system"
2626

2727
& uv tool install 'copier==9.6.0' --with 'copier-templates-extensions==0.3.0'

.github/dependabot.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "uv"
4+
directories:
5+
- "/"
6+
schedule:
7+
interval: "weekly"
8+
day: "sunday"
9+
time: "16:00"
10+
open-pull-requests-limit: 5
11+
ignore:
12+
- dependency-name: "*"
13+
update-types:
14+
- "version-update:semver-patch"
15+
16+
groups:
17+
prod-dependencies:
18+
dependency-type: "production"
19+
update-types:
20+
- "minor"
21+
- "patch"
22+
dev-dependencies:
23+
dependency-type: "development"
24+
update-types:
25+
- "minor"
26+
- "patch"

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ repos:
4242

4343
# Reformatting (should generally come before any file format or other checks, because reformatting can change things)
4444
- repo: https://github.com/crate-ci/typos
45-
rev: 15ff058881549e16b0edb975a9b0b0d0cccd612c # frozen: v1
45+
rev: 6cb49915af2e93e61f5f0d0a82216e28ad5c7c18 # frozen: v1
4646
hooks:
4747
- id: typos
4848
- repo: https://github.com/pre-commit/pre-commit-hooks
@@ -189,7 +189,7 @@ repos:
189189
description: Runs hadolint to lint Dockerfiles
190190

191191
- repo: https://github.com/astral-sh/ruff-pre-commit
192-
rev: e84319e627902e1b348574ecf3238dc511933dc7 # frozen: v0.11.7
192+
rev: f0fe93c067104b76ffb58852abe79673a8429bd1 # frozen: v0.11.8
193193
hooks:
194194
- id: ruff
195195
name: ruff-src
@@ -202,7 +202,7 @@ repos:
202202
- id: ruff-format
203203

204204
- repo: https://github.com/pylint-dev/pylint
205-
rev: 7ac5a4d4f77576df3a00e63f86ca86e0e1780b47 # frozen: v3.3.6
205+
rev: f798a4a3508bcbb8ad0773ae14bf32d28dcfdcbe # frozen: v3.3.7
206206
hooks:
207207
- id: pylint
208208
name: pylint

CHANGELOG.md

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/).
6+
7+
---
8+
9+
## [Unreleased]
10+
11+
### Added
12+
- Describe new features added in this version.
13+
14+
### Changed
15+
- Describe changes in existing functionality.
16+
17+
### Deprecated
18+
- List features that are still available but will be removed in future versions.
19+
20+
### Removed
21+
- List features that have been removed.
22+
23+
### Fixed
24+
- List any bug fixes.
25+
26+
### Security
27+
- Describe security fixes or improvements.
28+
29+
---
30+
31+
## [0.1.0] - 2024-12-18
32+
33+
### Added
34+
- Project setup.
35+
- Initial functionality implemented.
36+
37+
---
38+
39+
### How to Use This Changelog
40+
41+
- **Added:** For new features.
42+
- **Changed:** For changes in existing functionality.
43+
- **Deprecated:** For features that will soon be removed.
44+
- **Removed:** For features that have been removed.
45+
- **Fixed:** For bug fixes.
46+
- **Security:** In case of vulnerabilities addressed.
47+
48+
---
49+
50+
### Versioning
51+
52+
This project uses **Semantic Versioning (MAJOR.MINOR.PATCH)**:
53+
- **MAJOR:** Incompatible API changes.
54+
- **MINOR:** Backward-compatible new features.
55+
- **PATCH:** Backward-compatible bug fixes.
56+
57+
For example:
58+
- `1.0.0`: Major release with breaking changes.
59+
- `1.1.0`: New backward-compatible feature.
60+
- `1.1.1`: Bug fix or minor change.
61+
62+
---
63+
64+
### Contributing to the Changelog
65+
66+
When contributing changes, ensure you update the `[Unreleased]` section of this file with a brief description of your contribution.
67+
68+
- Use clear, concise language.
69+
- Categorize your change under **Added**, **Changed**, **Deprecated**, **Removed**, **Fixed**, or **Security**.
70+
71+
When releasing a new version:
72+
1. Move changes from `[Unreleased]` to a new section with the version number and release date.
73+
2. Update any relevant documentation if necessary.
74+
75+
---
76+
77+
Thank you for helping us maintain a clean and clear changelog! 🚀

README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@
66

77
# Usage
88
To create a new repository using this template:
9-
1. Install `copier` and `copier-templates-extensions`. An easy way to do that is to copy the `.devcontainer/install-ci-tooling.sh` script in this repository into your new repo and then run it.
10-
2. Run copier to instantiate the template: `copier copy --trust gh:LabAutomationAndScreening/copier-python-package-template.git`
11-
3. Run `uv lock` to generate the lock file
12-
4. Commit the changes
13-
5. Rebuild your new devcontainer
9+
1. Create a basic devcontainer either using the Codespaces default or using the file `.devcontainer/devcontainer-to-instantiate-template.json` from [the base template repo](https://github.com/LabAutomationAndScreening/copier-base-template/blob/main/.devcontainer/devcontainer-to-instantiate-template.json)
10+
1. Inside that devcontainer, run `sh .devcontainer/install-ci-tooling.sh` to install necessary tooling to instantiate the template (you can copy/paste the script from this
11+
1. Delete all files currently in the repository. Optional...but makes it easiest to avoid git conflicts.
12+
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
14+
1. Run `python3 .github/workflows/hash_git_files.py . --for-devcontainer-config-update` to update the hash for your devcontainer file
15+
1. Commit the changes (optional)
16+
1. Rebuild your new devcontainer
1417

1518

1619

copier.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ssh_port_number:
2020
type: int
2121
help: What port should the devcontainer bind SSH to?
2222
# Pick a random port, but ensure it's not in the excluded port range on Windows (powershell: `netsh int ipv4 show excludedportrange protocol=tcp`)
23-
default: "{{ ([p for p in range(49152, 65536) if not (49752 <= p <= 49851 or 50000 <= p <= 50059 or 50060 <= p <= 50159 or 50160 <= p <= 50259 or 50260 <= p <= 50359 or 50914 <= p <= 51013 or 51114 <= p <= 51213 or 51214 <= p <= 51313 or 51314 <= p <= 51413 or 51623 <= p <= 51722 or 51723 <= p <= 51822 or 65269 <= p <= 65368 or 65369 <= p <= 65468))] | random }}"
23+
default: "{{ ( (range(49152, 49752) | list) + (range(49852, 50000) | list) + (range(50060, 50160) | list) + (range(50160, 50260) | list) + (range(50260, 50360) | list) + (range(50914, 51014) | list) + (range(51114, 51214) | list) + (range(51214, 51314) | list) + (range(51314, 51414) | list) + (range(51623, 51723) | list) + (range(51723, 51823) | list) + (range(65269, 65369) | list) + (range(65369, 65469) | list) ) | random }}"
2424

2525
use_windows_in_ci:
2626
type: bool

extensions/context.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def hook(self, context: dict[Any, Any]) -> dict[Any, Any]:
2020
context["copier_version"] = "9.6.0"
2121
context["copier_templates_extension_version"] = "0.3.0"
2222
context["sphinx_version"] = "8.1.3"
23-
context["pulumi_version"] = "3.163.0"
23+
context["pulumi_version"] = "3.167.0"
2424
context["pulumi_aws_version"] = "6.77.0"
2525
context["pulumi_aws_native_version"] = "1.27.0"
2626
context["pulumi_command_version"] = "1.0.2"
@@ -33,11 +33,16 @@ def hook(self, context: dict[Any, Any]) -> dict[Any, Any]:
3333
context["strawberry_graphql_version"] = "0.264.0"
3434
context["fastapi_version"] = "0.115.12"
3535
context["uvicorn_version"] = "0.34.0"
36-
context["lab_auto_pulumi_version"] = "0.1.11"
36+
context["lab_auto_pulumi_version"] = "0.1.12"
3737

38-
context["nuxt_ui_version"] = "^3.0.2"
39-
context["nuxt_version"] = "^3.16.2"
38+
context["nuxt_ui_version"] = "^3.1.1"
39+
context["nuxt_version"] = "^3.17.2"
4040
context["typescript_version"] = "^5.8.2"
41+
context["vue_version"] = "^3.5.13"
42+
context["vue_router_version"] = "^4.5.0"
43+
context["faker_version"] = "^9.7.0"
44+
context["graphql_codegen_cli_version"] = "^5.0.5"
45+
context["graphql_codegen_typescript_version"] = "^4.1.6"
4146

4247
context["gha_checkout"] = "v4.2.2"
4348
context["gha_setup_python"] = "v5.5.0"

0 commit comments

Comments
 (0)