Skip to content

Commit debd6d8

Browse files
authored
Update python packages (#4659)
1 parent a785240 commit debd6d8

27 files changed

Lines changed: 3714 additions & 3328 deletions

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v6
3030

3131
# Initializes the CodeQL tools for scanning.
3232
- name: Initialize CodeQL

.github/workflows/deploy-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2323
with:
2424
fetch-depth: 0
2525

.github/workflows/hypha-ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
runs-on: ubuntu-latest
1919
timeout-minutes: 5
2020
steps:
21-
- uses: actions/checkout@v4
22-
- uses: actions/setup-python@v5
21+
- uses: actions/checkout@v6
22+
- uses: actions/setup-python@v6
2323
with:
2424
python-version-file: ".python-version"
2525

@@ -58,13 +58,13 @@ jobs:
5858
group: [1, 2, 3]
5959

6060
steps:
61-
- uses: actions/checkout@v4
62-
- uses: actions/setup-python@v5
61+
- uses: actions/checkout@v6
62+
- uses: actions/setup-python@v6
6363
with:
6464
python-version-file: ".python-version"
6565

6666
- name: Install uv
67-
uses: astral-sh/setup-uv@v3
67+
uses: astral-sh/setup-uv@v7
6868
with:
6969
enable-cache: true
7070
cache-dependency-glob: "requirements**.txt"

.pre-commit-config.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/uv-pre-commit
3-
rev: "0.6.14"
3+
rev: "0.9.22"
44
hooks:
55
- id: uv-export
66
name: uv-export requirements/prod.txt
@@ -36,7 +36,7 @@ repos:
3636
]
3737

3838
- repo: https://github.com/astral-sh/ruff-pre-commit
39-
rev: "v0.11.6"
39+
rev: "v0.14.10"
4040
hooks:
4141
# Run the linter.
4242
- id: ruff
@@ -45,7 +45,7 @@ repos:
4545
- id: ruff-format
4646

4747
- repo: https://github.com/rtts/djhtml
48-
rev: "3.0.7"
48+
rev: "3.0.10"
4949
hooks:
5050
- id: djhtml
5151
files: .*/templates/.*\.html$
@@ -62,7 +62,7 @@ repos:
6262
types_or: [html, css]
6363

6464
- repo: https://github.com/biomejs/pre-commit
65-
rev: "v2.0.0-beta.1"
65+
rev: "v2.3.10"
6666
hooks:
6767
- id: biome-check
6868
additional_dependencies: ["@biomejs/biome@1.9.4"]
@@ -77,11 +77,11 @@ repos:
7777
- stylelint@16.11.0
7878
- stylelint-config-standard-scss@13.1.0
7979
- repo: https://github.com/gitleaks/gitleaks
80-
rev: v8.24.3
80+
rev: v8.30.0
8181
hooks:
8282
- id: gitleaks
8383

8484
- repo: https://github.com/crate-ci/typos
85-
rev: v1.31.1
85+
rev: v1.41.0
8686
hooks:
8787
- id: typos

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.12.11
1+
3.12

docker/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.12.11-bookworm
1+
FROM python:3.12-bookworm
22

33
# Add venv/bin to PATH.
44
ENV PATH="/opt/app/.venv/bin:/usr/local/bin:$PATH"
@@ -10,11 +10,11 @@ ENV UV_LINK_MODE=copy
1010
WORKDIR /opt/app
1111

1212
# Install node.
13-
COPY --from=node:24.1-slim /usr/local/bin /usr/local/bin
14-
COPY --from=node:24.1-slim /usr/local/lib/node_modules /usr/local/lib/node_modules
13+
COPY --from=node:24-slim /usr/local/bin /usr/local/bin
14+
COPY --from=node:24-slim /usr/local/lib/node_modules /usr/local/lib/node_modules
1515

1616
# Install uv.
17-
COPY --from=ghcr.io/astral-sh/uv:0.5.13 /uv /uvx /usr/local/bin
17+
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /usr/local/bin
1818

1919
# Install node dependencies.
2020
COPY package*.json ./

docker/prod/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Builder stage.
33
#
4-
FROM python:3.12.11-bookworm AS builder
4+
FROM python:3.12-bookworm AS builder
55

66
# Add venv/bin to PATH.
77
ENV PATH="/opt/app/.venv/bin:/usr/local/bin:$PATH"
@@ -19,11 +19,11 @@ WORKDIR /opt/app
1919
RUN mkdir -p ./hypha/static_compiled && mkdir -p ./hypha/media
2020

2121
# Install node.
22-
COPY --from=node:24.1-slim /usr/local/bin /usr/local/bin
23-
COPY --from=node:24.1-slim /usr/local/lib/node_modules /usr/local/lib/node_modules
22+
COPY --from=node:24-slim /usr/local/bin /usr/local/bin
23+
COPY --from=node:24-slim /usr/local/lib/node_modules /usr/local/lib/node_modules
2424

2525
# Install uv.
26-
COPY --from=ghcr.io/astral-sh/uv:0.5.13 /uv /uvx /usr/local/bin
26+
COPY --from=ghcr.io/astral-sh/uv:0.5.36 /uv /uvx /usr/local/bin
2727

2828
# Install node dependencies.
2929
COPY package*.json ./
@@ -45,7 +45,7 @@ RUN npm run build && python manage.py collectstatic --noinput --verbosity=0
4545
#
4646
# Production stage.
4747
#
48-
FROM python:3.12.11-slim-bookworm
48+
FROM python:3.12-slim-bookworm
4949

5050
# Add venv/bin to PATH.
5151
ENV PATH="/opt/app/.venv/bin:/usr/local/bin:$PATH"

docs/references/workflows.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Once an application is submitted (`INITIAL_STATE`) — it can transition into th
4343

4444
### 👳 Request with same time review
4545

46-
This workflow is a single stage process with an advisory council review or external review stage -- includes functionalties for external reviewers like advisory board members to access applications and submit reviews.
46+
This workflow is a single stage process with an advisory council review or external review stage -- includes functionalities for external reviewers like advisory board members to access applications and submit reviews.
4747

4848
It is very similar to the "Request with external review" workflow, see below, but the internal and external review step happens at the same step.
4949

@@ -62,7 +62,7 @@ Once an application is submitted (`INITIAL_STATE`) — it can transition into th
6262

6363
### 👳 Request with external review
6464

65-
This workflow is a single stage process with an advisory council review or external review stage -- includes functionalties for external reviewers like advisory board members to access applications and submit reviews.
65+
This workflow is a single stage process with an advisory council review or external review stage -- includes functionalities for external reviewers like advisory board members to access applications and submit reviews.
6666

6767
Proposal Persona: This funding organization relies on external partners for evaluations. Proposals submitted to this workflow are reviewed by staff members and an advisory board that is made up of trusted community members.
6868

@@ -86,7 +86,7 @@ Once an application is submitted (`INITIAL_STATE`) — it can transition into th
8686

8787
### 👪 Request with community review
8888

89-
This workflow is a single stage application process with functionalties for external reviewers, including applicants to carry out peer review of each other applications.
89+
This workflow is a single stage application process with functionalities for external reviewers, including applicants to carry out peer review of each other applications.
9090

9191
**Proposal Persona:**
9292

hypha/apply/users/urls.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
from django.urls import include, path, reverse_lazy
44
from django.views.generic import RedirectView
55
from django_ratelimit.decorators import ratelimit
6-
from elevate.views import elevate as elevate_view
6+
7+
from hypha.elevate.views import elevate as elevate_view
78

89
from .views import (
910
AccountView,

hypha/apply/users/views.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@
3737
from django_htmx.http import HttpResponseClientRedirect
3838
from django_otp import devices_for_user
3939
from django_ratelimit.decorators import ratelimit
40-
from elevate.mixins import ElevateMixin
41-
from elevate.utils import grant_elevated_privileges
42-
from elevate.views import redirect_to_elevate
4340
from hijack.views import AcquireUserView
4441
from social_django.utils import psa
4542
from social_django.views import complete
@@ -54,6 +51,9 @@
5451
from wagtail.users.views.users import change_user_perm
5552

5653
from hypha.core.mail import MarkdownMail
54+
from hypha.elevate.mixins import ElevateMixin
55+
from hypha.elevate.utils import grant_elevated_privileges
56+
from hypha.elevate.views import redirect_to_elevate
5757

5858
from .decorators import require_oauth_whitelist
5959
from .forms import (

0 commit comments

Comments
 (0)