Skip to content

Commit 1c3fe73

Browse files
authored
Merge pull request #483 from The-Strategy-Unit/tidy_up_project
tidy up project
2 parents 33790cc + 7358f5b commit 1c3fe73

File tree

11 files changed

+1231
-993
lines changed

11 files changed

+1231
-993
lines changed

.github/workflows/build_app.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: "Checkout GitHub Action"
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515

1616
- name: Install the latest version of uv
1717
uses: astral-sh/setup-uv@v6
@@ -72,7 +72,7 @@ jobs:
7272
name: dist-whl
7373
path: .
7474
- name: Upload artifact to the GitHub Release
75-
uses: softprops/action-gh-release@v1
75+
uses: softprops/action-gh-release@v2
7676
if: github.ref_type == 'tag'
7777
with:
7878
files: "*.whl"

.github/workflows/build_container.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ on:
1818

1919
jobs:
2020

21-
deploy-ghcr-dev:
21+
build-container:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: 'Checkout GitHub Action'
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v5
2626

2727
- name: 'Login to GitHub Container Registry'
28-
uses: docker/login-action@v1
28+
uses: docker/login-action@v3
2929
with:
3030
registry: ghcr.io
3131
username: ${{github.actor}}

.github/workflows/build_schema.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout repository
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
2222

2323
- name: Clone existing schemas branch content
2424
run: |
@@ -41,7 +41,7 @@ jobs:
4141
popd
4242
4343
- name: Upload to GitHub Pages
44-
uses: actions/upload-pages-artifact@v3
44+
uses: actions/upload-pages-artifact@v4
4545
with:
4646
path: schemas
4747

.github/workflows/codecov.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
shell: bash -l {0}
1616

1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919

2020
- name: Install the latest version of uv
2121
uses: astral-sh/setup-uv@v6
@@ -30,6 +30,6 @@ jobs:
3030
run: uv run pytest --cov=. tests/unit --ignore=tests --cov-branch --cov-report xml:coverage.xml
3131

3232
- name: Upload Coverage to Codecov
33-
uses: codecov/codecov-action@v4
33+
uses: codecov/codecov-action@v5
3434
with:
3535
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/linting.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ jobs:
66
ruff-check:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v5
1010

1111
- uses: astral-sh/ruff-action@v3
1212

1313
ruff-format-check:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
1717

1818
- uses: astral-sh/ruff-action@v3
1919
with:
@@ -22,7 +22,7 @@ jobs:
2222
ty-check:
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626

2727
- name: Install the latest version of uv
2828
uses: astral-sh/setup-uv@v6

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,4 +255,4 @@ cython_debug/
255255

256256
# PyPI configuration file
257257
.pypirc
258-
src/nhp/_version.py
258+
src/nhp/model/_version.py

.pylintrc

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

codecov.yml

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

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[project]
2-
name = "nhp_model"
2+
name = "nhp-model"
33
dynamic = ["version"]
44
description = "New Hospital Programme demand model"
55

@@ -116,7 +116,7 @@ pythonVersion = "3.11"
116116
typeCheckingMode = "basic"
117117

118118
[tool.setuptools_scm]
119-
version_file = "src/nhp/_version.py"
119+
version_file = "src/nhp/model/_version.py"
120120

121121
[tool.ty.src]
122122
exclude = ["notebooks"]

src/nhp/__init__.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)