Skip to content
Open
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/workflows/auto-fix-main-precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@ jobs:
~/.cache/pypoetry
~/.cache/pip
.venv
key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('**/pyproject.toml') }}
key: ${{ runner.os }}-poetry-py3.12-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('**/pyproject.toml') }}
restore-keys: |
${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}-
${{ runner.os }}-poetry-
${{ runner.os }}-poetry-py3.12-${{ hashFiles('**/poetry.lock') }}-
${{ runner.os }}-poetry-py3.12-

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11.2'
python-version: '3.12'

- name: Install Poetry
run: pip install poetry
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/auto-fix-pr-precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,15 @@ jobs:
~/.cache/pypoetry
~/.cache/pip
.venv
key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock', '**/pyproject.toml') }}
key: ${{ runner.os }}-poetry-py3.12-${{ hashFiles('**/poetry.lock', '**/pyproject.toml') }}
restore-keys: |
${{ runner.os }}-poetry-
${{ runner.os }}-poetry-py3.12-

- name: Set up Python
if: steps.bot_check.outputs.skip == 'false'
uses: actions/setup-python@v5
with:
python-version: '3.11.2'
python-version: '3.12'

- name: Install Poetry
if: steps.bot_check.outputs.skip == 'false'
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.11.2
python-version: 3.12

- name: Get Poetry cache directory
id: poetry-cache
Expand All @@ -73,10 +73,10 @@ jobs:
~/.cache/pypoetry
~/.cache/pip
.venv
key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('**/pyproject.toml') }}
key: ${{ runner.os }}-poetry-py3.12-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('**/pyproject.toml') }}
restore-keys: |
${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}-
${{ runner.os }}-poetry-
${{ runner.os }}-poetry-py3.12-${{ hashFiles('**/poetry.lock') }}-
${{ runner.os }}-poetry-py3.12-

- name: Print memory usage
run: free -h
Expand All @@ -102,7 +102,7 @@ jobs:
repository: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name || github.repository }}
- uses: actions/setup-python@v5
with:
python-version: 3.11.2
python-version: 3.12
- name: Run pre-commit
id: pre-commit
run: |
Expand Down Expand Up @@ -281,7 +281,7 @@ jobs:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- uses: actions/setup-python@v5
with:
python-version: 3.11.2
python-version: 3.12
- name: Cache apt packages
uses: actions/cache@v4
id: apt-cache
Expand All @@ -299,7 +299,7 @@ jobs:
- name: Install system dependencies
run: |
sudo apt-get update
sudo apt-get install -y xvfb chromium-browser chromium-chromedriver
sudo apt-get install -y xvfb chromium-browser chromium-chromedriver libmemcached-dev zlib1g-dev
- name: Copy apt cache to user directory
if: always()
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit-fix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: '3.12'

- name: Install pre-commit
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/regenerate-migrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'

- name: Install Poetry
run: |
Expand Down
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.11.2
3.12
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Stage 1: Build stage
FROM python:3.11.2 AS builder
FROM python:3.12 AS builder

ENV PYTHONUNBUFFERED 1
WORKDIR /blt
Expand Down Expand Up @@ -42,13 +42,13 @@ RUN poetry install --no-root --no-interaction
RUN pip install opentelemetry-api opentelemetry-instrumentation

# Stage 2: Runtime stage
FROM python:3.11.2-slim
FROM python:3.12-slim

ENV PYTHONUNBUFFERED 1
WORKDIR /blt

# Copy only necessary files from builder stage
COPY --from=builder /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages
COPY --from=builder /usr/local/lib/python3.12/site-packages /usr/local/lib/python3.12/site-packages
COPY --from=builder /usr/local/bin /usr/local/bin

# Install runtime system dependencies
Expand Down
33 changes: 15 additions & 18 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ authors = ["OWASP BLT <you@example.com>"]
license = "AGPLv3"

[tool.poetry.dependencies]
python = ">=3.11.2,<3.14"
python = ">=3.12,<3.14"
python-dotenv = "^1.1.0"
Django = "^5.2.9"
Django = "^6.0"
dj-database-url = "^2.3.0"
django-allauth = "^65.13.1"
beautifulsoup4 = "^4.14.3"
Expand Down
2 changes: 1 addition & 1 deletion website/migrations/0255_add_reviewer_contributor.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Migration(migrations.Migration):
migrations.AddConstraint(
model_name="githubreview",
constraint=models.CheckConstraint(
check=models.Q(reviewer__isnull=False) | models.Q(reviewer_contributor__isnull=False),
condition=models.Q(reviewer__isnull=False) | models.Q(reviewer_contributor__isnull=False),
name="at_least_one_reviewer",
),
),
Expand Down
2 changes: 1 addition & 1 deletion website/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2402,7 +2402,7 @@ class GitHubReview(models.Model):
class Meta:
constraints = (
models.CheckConstraint(
check=models.Q(reviewer__isnull=False) | models.Q(reviewer_contributor__isnull=False),
condition=models.Q(reviewer__isnull=False) | models.Q(reviewer_contributor__isnull=False),
name="at_least_one_reviewer",
),
)
Expand Down
Loading