Skip to content

Commit fa4aa24

Browse files
authored
Version bumps (#11)
Pull in upstream updates to bump versions of dependencies
1 parent 3193624 commit fa4aa24

File tree

19 files changed

+81
-52
lines changed

19 files changed

+81
-52
lines changed

.copier-answers.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# Changes here will be overwritten by Copier
2-
_commit: v0.0.5-57-g045b3f3
2+
_commit: v0.0.6-6-g2b24a38
33
_src_path: gh:LabAutomationAndScreening/copier-base-template.git
44
description: Copier template for creating Python libraries and executables
55
python_ci_versions:
66
- 3.12.7
7-
- 3.13.1
7+
- 3.13.2
88
python_version: 3.12.7
99
repo_name: copier-python-package-template
10+
repo_org_name: LabAutomationAndScreening
1011
ssh_port_number: 55874
1112
template_uses_pulumi: false
1213
template_uses_python: true

.devcontainer/install-ci-tooling.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# can pass in the full major.minor.patch version of python as an optional argument
33
set -ex
44

5-
curl -LsSf https://astral.sh/uv/0.5.28/install.sh | sh
5+
curl -LsSf https://astral.sh/uv/0.6.6/install.sh | sh
66
uv --version
77
# TODO: add uv autocompletion to the shell https://docs.astral.sh/uv/getting-started/installation/#shell-autocompletion
88

@@ -15,8 +15,8 @@ input="${1:-$default_version}"
1515
export UV_PYTHON="$input"
1616
export UV_PYTHON_PREFERENCE=only-system
1717

18-
uv tool install 'copier==9.4.1' --with 'copier-templates-extensions==0.3.0'
18+
uv tool install 'copier==9.5.0' --with 'copier-templates-extensions==0.3.0'
1919

20-
uv tool install 'pre-commit==4.0.1'
20+
uv tool install 'pre-commit==4.1.0'
2121

2222
uv tool list

.github/actions/install_deps_uv/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ runs:
2727
shell: bash
2828

2929
- name: Setup python
30-
uses: actions/setup-python@v5.3.0
30+
uses: actions/setup-python@v5.4.0
3131
with:
3232
python-version: ${{ env.PYTHON_VERSION }}
3333

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Set-StrictMode -Version Latest
44
$ErrorActionPreference = "Stop"
55

6-
irm https://astral.sh/uv/0.5.28/install.ps1 | iex
6+
irm https://astral.sh/uv/0.6.6/install.ps1 | iex
77

88
# Add uv to path (in github runner)
99
$env:Path = "C:\Users\runneradmin\.local\bin;$env:Path"
@@ -24,8 +24,8 @@ if ($args.Count -eq 0) {
2424
$env:UV_PYTHON = "$input"
2525
$env:UV_PYTHON_PREFERENCE="only-system"
2626

27-
& uv tool install 'copier==9.4.1' --with 'copier-templates-extensions==0.3.0'
27+
& uv tool install 'copier==9.5.0' --with 'copier-templates-extensions==0.3.0'
2828

29-
& uv tool install 'pre-commit==4.0.1'
29+
& uv tool install 'pre-commit==4.1.0'
3030

3131
& uv tool list

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Set up mutex # Github concurrency management is horrible, things get arbitrarily cancelled if queued up. So using mutex until github fixes itself. When multiple jobs are modifying cache at once, weird things can happen. possible issue is https://github.com/actions/toolkit/issues/658
3838
if: ${{ runner.os != 'Windows' }} # we're just gonna have to YOLO on Windows, because this action doesn't support it yet https://github.com/ben-z/gh-action-mutex/issues/14
39-
uses: ben-z/gh-action-mutex@d3d5b354d460d4b6a1e3ee5b7951678658327812 # v1.0.0-alpha.9
39+
uses: ben-z/gh-action-mutex@1ebad517141198e08d47cf72f3c0975316620a65 # v1.0.0-alpha.10
4040
with:
4141
branch: mutex-venv-${{ matrix.os }}-${{ matrix.python-version }}
4242
timeout-minutes: 30 # this is the amount of time this action will wait to attempt to acquire the mutex lock before failing, e.g. if other jobs are queued up in front of it
@@ -64,7 +64,7 @@ jobs:
6464

6565
- 3.12.7
6666

67-
- 3.13.1
67+
- 3.13.2
6868

6969
copier: [
7070
'--data-file tests/copier_data/data1.yaml',
@@ -115,7 +115,7 @@ jobs:
115115
116116
- name: Set up mutex # Github concurrency management is horrible, things get arbitrarily cancelled if queued up. So using mutex until github fixes itself. When multiple jobs are modifying cache at once, weird things can happen. possible issue is https://github.com/actions/toolkit/issues/658
117117
if: ${{ runner.os != 'Windows' }} # we're just gonna have to YOLO on Windows, because this action doesn't support it yet https://github.com/ben-z/gh-action-mutex/issues/14
118-
uses: ben-z/gh-action-mutex@d3d5b354d460d4b6a1e3ee5b7951678658327812 # v1.0.0-alpha.9
118+
uses: ben-z/gh-action-mutex@1ebad517141198e08d47cf72f3c0975316620a65 # v1.0.0-alpha.10
119119
with:
120120
branch: mutex-venv-${{ matrix.os }}-${{ matrix.python-version }}
121121
timeout-minutes: 30 # this is the amount of time this action will wait to attempt to acquire the mutex lock before failing, e.g. if other jobs are queued up in front of it

.pre-commit-config.yaml

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

4444
# Reformatting (should generally come before any file format or other checks, because reformatting can change things)
4545
- repo: https://github.com/crate-ci/typos
46-
rev: e59f226fadcb05a1440bd8b35ee994a9d21bf03b # frozen: typos-dict-v0.12.4
46+
rev: 2300ad1b6b5c37da54bcafb1a06211196503eac9 # frozen: v1
4747
hooks:
4848
- id: typos
4949
- repo: https://github.com/pre-commit/pre-commit-hooks
@@ -162,7 +162,7 @@ repos:
162162
description: Runs hadolint to lint Dockerfiles
163163

164164
- repo: https://github.com/astral-sh/ruff-pre-commit
165-
rev: 871f3bcae4fe473cd7109c3a068db975dc035e3b # frozen: v0.9.4
165+
rev: 41d2daf392fbf43341a77f24a9c6481a4b66af98 # frozen: v0.9.10
166166
hooks:
167167
- id: ruff
168168
name: ruff-src
@@ -175,7 +175,7 @@ repos:
175175
- id: ruff-format
176176

177177
- repo: https://github.com/pylint-dev/pylint
178-
rev: c2b01c3d0b6410d4c93eb1f32fb28f2116b1e68f # frozen: v3.3.4
178+
rev: aaab3ccb541532d2bcdf0410ab93ff4fafc266f5 # frozen: v3.3.5
179179
hooks:
180180
- id: pylint
181181
name: pylint

README.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
2+
[![Copier](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/copier-org/copier/master/img/badge/badge-black.json)](https://github.com/copier-org/copier)
3+
[![Actions status](https://www.github.com/LabAutomationAndScreening/copier-python-package-template/actions/workflows/ci.yaml/badge.svg?branch=main)](https://www.github.com/LabAutomationAndScreening/copier-python-package-template/actions)
4+
[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&message=Open&color=blue)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://www.github.com/LabAutomationAndScreening/copier-python-package-template)
25

36

7+
# Usage
8+
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
414

515

616

7-
8-
17+
# Development
918

1019

1120
## Updating from the template

copier.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ python_ci_versions:
3232
multiselect: true
3333
choices:
3434
- "3.12.7"
35-
- "3.13.1"
35+
- "3.13.2"
3636

3737

3838

@@ -67,6 +67,11 @@ use_windows_in_exe_ci:
6767
default: no
6868
when: is_frozen_executable
6969

70+
use_codecov:
71+
type: bool
72+
help: Upload code coverage results to CodeCov?
73+
default: no
74+
7075

7176
# Additional Settings
7277
_min_copier_version: "9.4"

extensions/context.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,35 @@ class ContextUpdater(ContextHook):
1010

1111
@override
1212
def hook(self, context: dict[Any, Any]) -> dict[Any, Any]:
13-
context["uv_version"] = "0.5.28"
14-
context["pre_commit_version"] = "4.0.1"
15-
context["pyright_version"] = "1.1.394"
13+
context["uv_version"] = "0.6.6"
14+
context["pre_commit_version"] = "4.1.0"
15+
context["pyright_version"] = "1.1.396"
1616
context["pytest_version"] = "8.3.4"
1717
context["pytest_randomly_version"] = "3.16.0"
1818
context["pytest_cov_version"] = "6.0.0"
19-
context["copier_version"] = "9.4.1"
19+
context["copier_version"] = "9.5.0"
2020
context["copier_templates_extension_version"] = "0.3.0"
2121
context["sphinx_version"] = "8.1.3"
22-
context["pulumi_version"] = "3.149.0"
22+
context["pulumi_version"] = "3.155.0"
2323
context["pulumi_aws_version"] = "6.67.0"
2424
context["pulumi_aws_native_version"] = "1.25.0"
2525
context["pulumi_command_version"] = "1.0.1"
26-
context["boto3_version"] = "1.36.3"
26+
context["pulumi_github"] = ""
27+
context["boto3_version"] = "1.37.11"
2728
context["ephemeral_pulumi_deploy_version"] = "0.0.2"
2829
context["pydantic_version"] = "2.10.6"
2930
context["pyinstaller_version"] = "6.12.0"
3031

3132
context["gha_checkout"] = "v4.2.2"
32-
context["gha_setup_python"] = "v5.3.0"
33+
context["gha_setup_python"] = "v5.4.0"
3334
context["gha_cache"] = "v4.2.0"
3435
context["gha_upload_artifact"] = "v4.4.3"
3536
context["gha_configure_aws_credentials"] = "v4.0.2"
36-
context["gha_mutex"] = "d3d5b354d460d4b6a1e3ee5b7951678658327812 # v1.0.0-alpha.9"
37+
context["gha_mutex"] = "1ebad517141198e08d47cf72f3c0975316620a65 # v1.0.0-alpha.10"
3738
context["gha_linux_runner"] = "ubuntu-24.04"
3839
context["gha_windows_runner"] = "windows-2022"
3940

4041
context["py311_version"] = ""
4142
context["py312_version"] = "3.12.7"
42-
context["py313_version"] = "3.13.1"
43+
context["py313_version"] = "3.13.2"
4344
return context

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ dependencies = [
99
"pytest>=8.3.4",
1010
"pytest-cov>=6.0.0",
1111
"pytest-randomly>=3.16.0",
12-
"pyright[nodejs]>=1.1.394",
13-
"copier>=9.4.1",
12+
"pyright[nodejs]>=1.1.396",
13+
"copier>=9.5.0",
1414
"copier-templates-extensions>=0.3.0"
1515

1616
# Specific to this template

0 commit comments

Comments
 (0)