Skip to content

Commit 6c98718

Browse files
committed
Merge with master
2 parents e159678 + 52f48c6 commit 6c98718

File tree

18 files changed

+303
-113
lines changed

18 files changed

+303
-113
lines changed

.github/workflows/checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@v5
26+
uses: actions/checkout@v6
2727
with:
2828
lfs: false
2929
- name: Cache tox

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: ubuntu-latest
3232
steps:
3333
- name: Checkout repository
34-
uses: actions/checkout@v5
34+
uses: actions/checkout@v6
3535
with:
3636
lfs: true
3737
- name: Cache tox

.github/workflows/run-on-comment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
return pr.head.sha;
116116
117117
- name: Checkout SHA
118-
uses: actions/checkout@v5
118+
uses: actions/checkout@v6
119119
with:
120120
lfs: true
121121
ref: ${{ steps.sha.outputs.result }}
@@ -194,7 +194,7 @@ jobs:
194194
195195
- name: Upload artifact if requested
196196
if: "${{ inputs.artifact-path != '' }}"
197-
uses: actions/upload-artifact@v4
197+
uses: actions/upload-artifact@v5
198198
with:
199199
name: ${{ inputs.artifact-name }}
200200
path: ${{ inputs.artifact-path }}

.github/workflows/run-profiling.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
timeout-minutes: 8640
113113
steps:
114114
- name: Checkout repository
115-
uses: actions/checkout@v5
115+
uses: actions/checkout@v6
116116
with:
117117
ref: ${{ github.sha }}
118118
lfs: true
@@ -132,7 +132,7 @@ jobs:
132132
133133
## Upload the output as an artifact so we can push it to the profiling repository
134134
- name: Save results as artifact
135-
uses: actions/upload-artifact@v4
135+
uses: actions/upload-artifact@v5
136136
with:
137137
name: ${{ needs.set-variables.outputs.artifact-name }}
138138
path: ${{ needs.set-variables.outputs.profiling-output-dir }}
@@ -155,7 +155,7 @@ jobs:
155155
)
156156
steps:
157157
- name: Download the profiling results
158-
uses: actions/download-artifact@v5
158+
uses: actions/download-artifact@v6
159159
with:
160160
name: ${{ needs.set-variables.outputs.artifact-name }}
161161
path: ${{ needs.set-variables.outputs.profiling-output-dir }}
@@ -177,7 +177,7 @@ jobs:
177177
user_name: rc-softdev-admin
178178

179179
- name: Trigger website rebuild
180-
uses: peter-evans/repository-dispatch@v3
180+
uses: peter-evans/repository-dispatch@v4
181181
with:
182182
token: ${{ secrets.PROFILING_REPO_ACCESS }}
183183
repository: UCL/TLOmodel-profiling

.github/workflows/tests-unpinned.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
runs-on: ${{ matrix.os }}
1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@v6
1818
with:
1919
lfs: true
2020
- name: Cache tox

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
outputs:
3939
matrix: ${{ steps.set-matrix.outputs.matrix }}
4040
steps:
41-
- uses: actions/checkout@v5
41+
- uses: actions/checkout@v6
4242
with:
4343
# No tests should be under LFS so no need to fetch LFS files
4444
lfs: false
@@ -64,7 +64,7 @@ jobs:
6464
fail-fast: false
6565
matrix: ${{ fromJson(needs.gen-test-matrix.outputs.matrix) }}
6666
steps:
67-
- uses: actions/checkout@v5
67+
- uses: actions/checkout@v6
6868
with:
6969
lfs: true
7070
- name: System info

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ line-length = 120
126126
exclude = ['src/tlo/_version.py']
127127

128128
[tool.ruff.lint]
129-
select = ["E", "F", "I", "W"]
130-
per-file-ignores = {"src/scripts/**" = ["E501", "W"]}
129+
select = ["E", "F", "I"]
130+
per-file-ignores = {"src/scripts/**" = ["E501"]}
131131

132132
[tool.setuptools.packages.find]
133133
where = ["src"]

resources/ResourceFile_Alri/Calculations.csv

Lines changed: 0 additions & 3 deletions
This file was deleted.

resources/ResourceFile_Alri/Lazzerini CFR.csv

Lines changed: 0 additions & 3 deletions
This file was deleted.

resources/ResourceFile_Alri/Parameter_values.csv

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)