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
8 changes: 4 additions & 4 deletions .github/actions/docker_build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ runs:

- name: Restore cached regclient
id: cache-regclient-restore
uses: actions/cache/restore@v4
uses: actions/cache/restore@v5
with:
path: $HOME/.regctl
key: ${{ runner.os }}-regclient
Expand All @@ -67,7 +67,7 @@ runs:
uses: regclient/actions/regctl-installer@main
- name: Cache regclient
id: cache-regclient-save
uses: actions/cache/save@v4
uses: actions/cache/save@v5
with:
path: $HOME/.regctl
key: ${{ runner.os }}-regclient
Expand Down Expand Up @@ -95,7 +95,7 @@ runs:
uses: ./.github/actions/last_commit
- name: Docker meta
id: meta
uses: docker/metadata-action@v5.8.0
uses: docker/metadata-action@v5
with:
images: ${{ inputs.image }}
flavor: |
Expand Down Expand Up @@ -139,7 +139,7 @@ runs:
fi
- name: Set up Docker BuildX
if: steps.image_status.outputs.updated != 'true' || inputs.rebuild == 'true'
uses: docker/setup-buildx-action@v3.3.0
uses: docker/setup-buildx-action@v3
with:
platforms: linux/amd64
driver: docker-container
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ jobs:
PYTHONPATH: src/
steps:
- uses: actions/checkout@v6
- uses: actions/setup-python@v5
- uses: actions/setup-python@v6
id: setup-python
with:
python-version: '3.13'
- uses: yezz123/setup-uv@v4
- uses: astral-sh/setup-uv@v7

- uses: actions/cache/restore@v5
id: restore-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
if: github.event.pull_request.draft == false && needs.changes.outputs.lint
steps:
- uses: actions/checkout@v6
- uses: actions/setup-python@v5
- uses: actions/setup-python@v6
with:
python-version: '3.12'
- name: Install requirements
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Docker meta
id: meta
uses: docker/metadata-action@v5.8.0
uses: docker/metadata-action@v5
with:
images: "unicef/hope-country-report"
tags: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sdlc-version-create.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@ jobs:
uses: actions/checkout@v6

- name: Run Trivy vulnerability scanner
uses: aquasecurity/[email protected]
uses: aquasecurity/[email protected].1
with:
image-ref: ${{ vars.DOCKERHUB_ORGANIZATION }}/${{ vars.DOCKERHUB_REPOSITORY }}:${{ needs.prepare-version.outputs.version }}
format: 'sarif'
output: 'trivy-results.sarif'
severity: 'CRITICAL,HIGH'

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v3
uses: github/codeql-action/upload-sarif@v4
with:
sarif_file: 'trivy-results.sarif'
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ jobs:
echo BRANCH="${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_ENV
- name: Docker meta
id: meta
uses: docker/metadata-action@v5.8.0
uses: docker/metadata-action@v5
with:
images: "unicef/hope-country-report"
tags: |
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
tox -e d52

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
continue-on-error: true
with:
env_vars: OS,PYTHON
Expand Down
7 changes: 5 additions & 2 deletions src/hope_country_report/apps/core/admin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import TYPE_CHECKING
from typing import TYPE_CHECKING, Any

from admin_extra_buttons.decorators import button
from admin_extra_buttons.mixins import ExtraButtonsMixin
Expand All @@ -24,7 +24,10 @@ class BaseAdmin(DisplayAllMixin, ExtraButtonsMixin, admin.ModelAdmin): # type:

@admin.register(User)
class UserAdmin(_UserAdminPlus): # type: ignore
pass
def get_fieldsets(self, request: "AuthHttpRequest", obj: Any | None = None) -> tuple:
if not obj:
return self.add_fieldsets
return self.fieldsets


class UserRoleForm(forms.ModelForm): # type: ignore
Expand Down

Large diffs are not rendered by default.

1,412 changes: 799 additions & 613 deletions uv.lock

Large diffs are not rendered by default.

Loading