Skip to content

Commit 2b9aab3

Browse files
helmut-hoffer-von-ankershoffenhelmut-hoffer-von-ankershoffen
committed
chore(deps): update from template
1 parent 29dd8ba commit 2b9aab3

19 files changed

Lines changed: 1213 additions & 558 deletions

‎.copier-answers.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
_commit: v0.8.28
1+
_commit: v0.8.31
22
_src_path: gh:helmut-hoffer-von-ankershoffen/oe-python-template
33
attestations_enabled: true
44
author_email: helmuthva@gmail.com

‎.github/workflows/docker-image-build-publish.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,8 @@ jobs:
2424
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2525

2626
- name: Install dev tools
27-
run: |
28-
wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | sudo apt-key add -
29-
echo deb https://aquasecurity.github.io/trivy-repo/deb $(lsb_release -sc) main | sudo tee -a /etc/apt/sources.list.d/trivy.list
30-
sudo apt-get update
31-
sudo apt-get install -y curl jq xsltproc gnupg2 trivy
27+
shell: bash
28+
run: .github/workflows/install_dev_tools.bash
3229

3330
- name: Set up QEMU
3431
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
@@ -37,7 +34,6 @@ jobs:
3734
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
3835

3936

40-
4137
- name: Log in to Docker Hub
4238
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
4339
with:

‎.github/workflows/install_dev_tools.bash‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/bin/bash
2+
3+
set -e # Exit immediately if a command exits with a non-zero status
4+
set -o pipefail # Return value of a pipeline is the value of the last command to exit with a non-zero status
5+
6+
# Log function for better debugging
7+
log() {
8+
echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')] $*"
9+
}
10+
11+
log "Starting installation of development tools..."
12+
13+
wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | sudo apt-key add -
14+
echo deb https://aquasecurity.github.io/trivy-repo/deb $(lsb_release -sc) main | sudo tee -a /etc/apt/sources.list.d/trivy.list
15+
sudo apt-get update
16+
sudo apt-get install -y curl jq xsltproc gnupg2 imagemagick trivy
17+
18+
.github/workflows/install_dev_tools_project.bash
19+
20+
log "Completed installation of development tools."

‎.github/workflows/install_dev_tools_project.bash‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/bash
2+
3+
set -e # Exit immediately if a command exits with a non-zero status
4+
set -o pipefail # Return value of a pipeline is the value of the last command to exit with a non-zero status
5+
6+
# Log function for better debugging
7+
log() {
8+
echo "[$(date +'%Y-%m-%dT%H:%M:%S%z')] $*"
9+
}
10+
11+
log "Starting installation of development tools specific to OE Python Template Example..."
12+
13+
# Add your project specific installation commands here
14+
# sudo apt-get install -y curl jq xsltproc gnupg2 imagemagick trivy
15+
16+
log "Completed installation of development tools specific to OE Python Template Example."

‎.github/workflows/package-build-publish-release.yml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,19 @@ jobs:
1919
with:
2020
fetch-depth: 0
2121

22+
- name: Install uv
23+
uses: astral-sh/setup-uv@f94ec6bedd8674c4426838e6b50417d36b6ab231 # v5.3.1
24+
with:
25+
version: "0.6.3"
26+
cache-dependency-glob: uv.lock
27+
enable-cache: true
28+
2229
- name: Install dev tools
23-
run: |
24-
wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | sudo apt-key add -
25-
echo deb https://aquasecurity.github.io/trivy-repo/deb $(lsb_release -sc) main | sudo tee -a /etc/apt/sources.list.d/trivy.list
26-
sudo apt-get update
27-
sudo apt-get install -y curl jq xsltproc gnupg2 trivy
30+
shell: bash
31+
run: .github/workflows/install_dev_tools.bash
32+
33+
- name: Docs
34+
run: make docs
2835

2936
- name: Generate release notes
3037
uses: orhun/git-cliff-action@4a4a951bc43fafe41cd2348d181853f52356bee7 # v4.4.2
@@ -39,29 +46,23 @@ jobs:
3946
- name: Print the release notes
4047
run: cat "${{ steps.git-cliff.outputs.changelog }}"
4148

42-
- name: Install uv
43-
uses: astral-sh/setup-uv@f94ec6bedd8674c4426838e6b50417d36b6ab231 # v5.3.1
44-
with:
45-
version: "0.6.3"
46-
cache-dependency-glob: uv.lock
47-
enable-cache: true
48-
4949
- name: Build distribution into dist/
50-
run: uv build
50+
run: make dist
5151

5252

5353
- name: Publish distribution to Python Package Index at pypi.org
5454
run: uv publish -t ${{ secrets.UV_PUBLISH_TOKEN }}
5555

5656

5757
- name: Have audit checks publish to reports/ for auditing
58-
run: uv run nox -s audit
58+
run: make audit
5959

6060
- name: Create GitHub release
6161
env:
6262
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6363
run: |
64-
gh release create ${{ github.ref_name }} ./dist/* ./reports/* --notes-file ${{ steps.git-cliff.outputs.changelog }}
64+
gh release create ${{ github.ref_name }} ./dist/* ./reports/* \
65+
--notes-file ${{ steps.git-cliff.outputs.changelog }}
6566
6667
- name: Allow other workflows to trigger on release
6768
env:

‎.github/workflows/test-and-report.yml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,19 @@ jobs:
2121
with:
2222
fetch-depth: 0
2323

24-
- name: Install dev tools
25-
run: |
26-
wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | sudo apt-key add -
27-
echo deb https://aquasecurity.github.io/trivy-repo/deb $(lsb_release -sc) main | sudo tee -a /etc/apt/sources.list.d/trivy.list
28-
sudo apt-get update
29-
sudo apt-get install -y curl jq xsltproc gnupg2 imagemagick trivy
30-
31-
- name: Install project specific dependencies
32-
run: |
33-
# sudo apt-get install -y YOUR_PROJECT_DEPENDENCIES
34-
35-
- name: Install uv (python package manager)
24+
- name: Install uv
3625
uses: astral-sh/setup-uv@f94ec6bedd8674c4426838e6b50417d36b6ab231 # v5.3.1
3726
with:
3827
version: "0.6.3"
3928
enable-cache: true
4029
cache-dependency-glob: uv.lock
4130

31+
- name: Install dev tools
32+
shell: bash
33+
run: .github/workflows/install_dev_tools.bash
34+
4235
- name: Install Python, venv and dependencies
43-
run: |
44-
uv sync --all-extras --frozen --link-mode=copy
36+
run: uv sync --all-extras --frozen --link-mode=copy
4537

4638
- name: Release version check
4739
if: startsWith(github.ref, 'refs/tags/v')
@@ -74,25 +66,33 @@ jobs:
7466
fi
7567
7668
- name: Smoke tests
77-
run: |
78-
uv run --no-dev oe-python-template-example hello-world
69+
run: uv run --no-dev oe-python-template-example hello-world
7970

80-
- name: Run unit tests, measure coverage, lint, and check vulnerabilities
81-
run: |
82-
uv run --all-extras nox
71+
- name: Lint
72+
run: make lint
73+
74+
- name: Audit
75+
run: make audit
76+
77+
- name: Test
78+
run: make test
8379

8480
- name: Upload test results
8581
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
8682
if: ${{ always() && (env.GITHUB_WORKFLOW_RUNTIME != 'ACT') }}
8783
with:
8884
name: test-results
8985
path: |
90-
junit.xml
91-
coverage.xml
92-
coverage_html/
93-
vulnerabilities.json
94-
licenses.json
95-
licenses-inverted.json
86+
reports/mypy_junit.xml
87+
reports/sbom.json
88+
reports/sbom.spdx
89+
reports/licenses.csv
90+
reports/licenses.json
91+
reports/licenses_grouped.json
92+
reports/vulnerabilities.json
93+
reports/junit.xml
94+
reports/coverage.xml
95+
reports/coverage_html
9696
retention-days: 30
9797

9898
- name: Upload coverage reports to Codecov

‎.github/workflows/test-scheduled.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: "CI Scheduled"
22

33
on:
44
schedule:
5-
- cron: '0 7 * * *'
5+
- cron: '0 6 * * *'
66

77
jobs:
88
test-scheduled:
@@ -24,8 +24,7 @@ jobs:
2424
cache-dependency-glob: uv.lock
2525

2626
- name: Install Python, venv and dependencies
27-
run: |
28-
uv sync --all-extras --frozen --link-mode=copy
27+
run: uv sync --all-extras --frozen --link-mode=copy
2928

3029
- name: Create .env file
3130
uses: SpicyPizza/create-envfile@ace6d4f5d7802b600276c23ca417e669f1a06f6f # v2.0.3
@@ -34,5 +33,4 @@ jobs:
3433
fail_on_empty: true
3534

3635
- name: Run tests marked as scheduled
37-
run: |
38-
uv run --all-extras nox -s test -p 3.11 -- -m scheduled
36+
run: make test_scheduled

‎.github/workflows/vercel-preview.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1818

19-
- name: Install uv (python package manager)
19+
- name: Install uv
2020
uses: astral-sh/setup-uv@f94ec6bedd8674c4426838e6b50417d36b6ab231 # v5.3.1
2121
with:
2222
version: "0.6.3"
@@ -27,8 +27,7 @@ jobs:
2727
run: npm install --global vercel@latest
2828

2929
- name: Make Vercel distribution
30-
run: |
31-
make dist_vercel
30+
run: make dist_vercel
3231

3332
- name: Deploy to Vercel
3433
id: deploy-vercel

‎.github/workflows/vercel-production.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1818

19-
- name: Install uv (python package manager)
19+
- name: Install uv
2020
uses: astral-sh/setup-uv@f94ec6bedd8674c4426838e6b50417d36b6ab231 # v5.3.1
2121
with:
2222
version: "0.6.3"
@@ -27,8 +27,7 @@ jobs:
2727
run: npm install --global vercel@latest
2828

2929
- name: Make Vercel distribution
30-
run: |
31-
make dist_vercel
30+
run: make dist_vercel
3231

3332
- name: Deploy to Vercel
3433
id: deploy-vercel

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ repos:
6767
- id: uv-lock
6868
- repo: local
6969
hooks:
70-
- id: nox
71-
name: nox
70+
- id: make
71+
name: make
7272
entry: make
7373
language: system
7474
pass_filenames: false

0 commit comments

Comments
 (0)