Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier
_commit: v0.0.60
_commit: v0.0.61
_src_path: gh:LabAutomationAndScreening/copier-base-template.git
description: Copier template for creating Python libraries and executables
python_ci_versions:
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@
"initializeCommand": "sh .devcontainer/initialize-command.sh",
"onCreateCommand": "sh .devcontainer/on-create-command.sh",
"postStartCommand": "sh .devcontainer/post-start-command.sh"
// Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): 2b781a57 # spellchecker:disable-line
// Devcontainer context hash (do not manually edit this, it's managed by a pre-commit hook): 9e371a58 # spellchecker:disable-line
}
2 changes: 1 addition & 1 deletion .devcontainer/install-ci-tooling.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import tempfile
from pathlib import Path

UV_VERSION = "0.8.3"
UV_VERSION = "0.8.4"
PNPM_VERSION = "10.14.0"
COPIER_VERSION = "9.8.0"
COPIER_TEMPLATE_EXTENSIONS_VERSION = "0.3.2"
Expand Down
15 changes: 12 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,20 @@ env:
PRE_COMMIT_HOME: ${{ github.workspace }}/.precommit_cache

permissions:
id-token: write
contents: write # needed for mutex, and updating dependabot branches
statuses: write # needed for updating status on Dependabot PRs
id-token: write # needed to assume OIDC roles (e.g. for downloading from CodeArtifact)

jobs:
get-values:
uses: ./.github/workflows/get-values.yaml
permissions:
contents: write # needed for updating dependabot branches

pre-commit:
needs: [ get-values ]
uses: ./.github/workflows/pre-commit.yaml
permissions:
contents: write # needed for mutex
id-token: write # needed to assume OIDC roles (e.g. for downloading from CodeArtifact)
with:
python-version: 3.12.7

Expand All @@ -43,6 +46,10 @@ jobs:
'--data-file tests/copier_data/data3.yaml',
]
runs-on: ${{ matrix.os }}
env:
UV_PYTHON: ${{ matrix.python-version }}
permissions:
contents: write # needed for mutex

steps:
- name: Checkout code
Expand Down Expand Up @@ -125,6 +132,8 @@ jobs:
required-check:
runs-on: ubuntu-24.04
needs: [ lint-matrix, get-values ]
permissions:
statuses: write # needed for updating status on Dependabot PRs
if: always()
steps:
- name: fail if prior job failure
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/get-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
PYTHONUNBUFFERED: True

permissions:
contents: write # needed to push commit of new devcontainer hash for dependabot PRs
contents: write # needed to push commit of new devcontainer hash for dependabot PRs

jobs:
get-values:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ env:
PRE_COMMIT_HOME: ${{ github.workspace }}/.precommit_cache

permissions:
contents: write # needed for mutex
contents: write # needed for mutex
id-token: write # needed to assume OIDC roles (e.g. for downloading from CodeArtifact)

jobs:
pre-commit:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ coverage-report-pytest
.mypy_cache/
.coverage
.coverage.*
coverage.xml

# test profiling
prof/
Expand Down
2 changes: 1 addition & 1 deletion extensions/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class ContextUpdater(ContextHook):

@override
def hook(self, context: dict[Any, Any]) -> dict[Any, Any]:
context["uv_version"] = "0.8.3"
context["uv_version"] = "0.8.4"
context["pnpm_version"] = "10.14.0"
context["pre_commit_version"] = "4.2.0"
context["pyright_version"] = "1.1.403"
Expand Down
18 changes: 14 additions & 4 deletions template/.github/workflows/ci.yaml.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,21 @@ env:
PRE_COMMIT_HOME: ${{ github.workspace }}/.precommit_cache

permissions:
id-token: write
contents: write # needed for mutex, and updating dependabot branches
statuses: write # needed for updating status on Dependabot PRs
id-token: write # needed to assume OIDC roles (e.g. for downloading from CodeArtifact)

jobs:
get-values:
uses: ./.github/workflows/get-values.yaml
permissions:
contents: write # needed updating dependabot branches

lint:
needs: [ get-values ]
name: Pre-commit
uses: ./.github/workflows/pre-commit.yaml
permissions:
contents: write # needed for mutex
id-token: write # needed to assume OIDC roles (e.g. for downloading from CodeArtifact)
with:
python-version: {% endraw %}{{ python_version }}{% raw %}

Expand All @@ -43,7 +46,8 @@ jobs:
JOB_MATCHING_DEV_ENV: true

runs-on: ${{ matrix.os }}

env:
UV_PYTHON: ${{ matrix.python-version }}
steps:
- name: Checkout code
uses: actions/checkout@{% endraw %}{{ gha_checkout }}{% raw %}
Expand Down Expand Up @@ -84,6 +88,8 @@ jobs:
- {{ item }}
{% endfor %}{% raw %}
runs-on: ${{ matrix.os }}
env:
UV_PYTHON: ${{ matrix.python-version }}

steps:
- name: Checkout code
Expand Down Expand Up @@ -117,6 +123,8 @@ jobs:
{% endfor %}{% raw %}

runs-on: {% endraw %}{{ gha_linux_runner }}{% raw %}
env:
UV_PYTHON: ${{ matrix.python-version }}

steps:
- name: Checkout code
Expand All @@ -137,6 +145,8 @@ jobs:

required-check:
runs-on: {% endraw %}{{ gha_linux_runner }}{% raw %}
permissions:
statuses: write # needed for updating status on Dependabot PRs
needs:
- test
- get-values{% endraw %}{% if create_docs %}
Expand Down
2 changes: 1 addition & 1 deletion template/.github/workflows/get-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
PYTHONUNBUFFERED: True

permissions:
contents: write # needed to push commit of new devcontainer hash for dependabot PRs
contents: write # needed to push commit of new devcontainer hash for dependabot PRs

jobs:
get-values:
Expand Down
3 changes: 2 additions & 1 deletion template/.github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ env:
PRE_COMMIT_HOME: ${{ github.workspace }}/.precommit_cache

permissions:
contents: write # needed for mutex
contents: write # needed for mutex
id-token: write # needed to assume OIDC roles (e.g. for downloading from CodeArtifact)

jobs:
pre-commit:
Expand Down
12 changes: 10 additions & 2 deletions template/.github/workflows/publish.yaml.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ env:
PRE_COMMIT_HOME: ${{ github.workspace }}/.precommit_cache

permissions:
id-token: write
contents: write # needed for mutex
id-token: write # needed to assume OIDC roles (e.g. for downloading from CodeArtifact)

jobs:
get-values:
Expand All @@ -39,6 +38,9 @@ jobs:
lint:
name: Pre-commit
uses: ./.github/workflows/pre-commit.yaml
permissions:
contents: write # needed for mutex
id-token: write # needed to assume OIDC roles (e.g. for downloading from CodeArtifact)
with:
python-version: {% endraw %}{{ python_version }}{% raw %}

Expand All @@ -59,6 +61,8 @@ jobs:
JOB_MATCHING_DEV_ENV: true

runs-on: ${{ matrix.os }}
env:
UV_PYTHON: ${{ matrix.python-version }}

steps:
- name: Checkout code
Expand Down Expand Up @@ -167,6 +171,8 @@ jobs:
JOB_MATCHING_DEV_ENV: true

runs-on: ${{ matrix.os }}
env:
UV_PYTHON: ${{ matrix.python-version }}

steps:
- name: Checkout code
Expand Down Expand Up @@ -258,6 +264,8 @@ jobs:
JOB_MATCHING_DEV_ENV: true

runs-on: ${{ matrix.os }}
env:
UV_PYTHON: ${{ matrix.python-version }}

steps:
- name: Checkout code
Expand Down
8 changes: 6 additions & 2 deletions template/.github/workflows/publish_to_staging.yaml.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ env:
PRE_COMMIT_HOME: ${{ github.workspace }}/.precommit_cache

permissions:
id-token: write
contents: write # needed for mutex
id-token: write # needed to assume OIDC roles (e.g. for downloading from CodeArtifact)

jobs:
lint:
name: Pre-commit
uses: ./.github/workflows/pre-commit.yaml
permissions:
contents: write # needed for mutex
id-token: write # needed to assume OIDC roles (e.g. for downloading from CodeArtifact)
with:
python-version: {% endraw %}{{ python_version }}{% raw %}

Expand All @@ -35,6 +37,8 @@ jobs:
JOB_MATCHING_DEV_ENV: true

runs-on: ${{ matrix.os }}
env:
UV_PYTHON: ${{ matrix.python-version }}

steps:
- name: Checkout code
Expand Down
1 change: 1 addition & 0 deletions template/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ coverage-report-pytest
.mypy_cache/
.coverage
.coverage.*
coverage.xml

# test profiling
prof/
Expand Down