Skip to content

Commit 489db78

Browse files
committed
Remove matrix, 3.14 works
1 parent ee46889 commit 489db78

File tree

5 files changed

+18
-120
lines changed

5 files changed

+18
-120
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,17 @@ on:
88
jobs:
99
test:
1010
runs-on: ubuntu-latest
11-
strategy:
12-
fail-fast: false
13-
matrix:
14-
python-version:
15-
- "3.12"
16-
- "3.13"
17-
- "3.14"
1811
steps:
1912
- name: Install uv
2013
uses: astral-sh/setup-uv@v6
21-
with:
22-
python-version: ${{ matrix.python-version }}
2314

2415
- name: create project
25-
run: |
26-
uv run --with django django-admin startproject \
27-
--template="https://github.com/lincolnloop/django-layout/zipball/$GITHUB_REF_NAME" \
28-
--extension=py,md,gitignore,yaml,json,toml \
29-
--name=Makefile,Dockerfile \
30-
--exclude=.github \
16+
run: >
17+
uv run --with django django-admin startproject
18+
--template="https://github.com/lincolnloop/django-layout/zipball/$GITHUB_REF_NAME"
19+
--extension=py,md,gitignore,yaml,json,toml
20+
--name=Makefile,Dockerfile
21+
--exclude=.github
3122
testproj .
3223
3324
- name: mock client build
@@ -36,10 +27,7 @@ jobs:
3627
touch client/dist/index.js
3728
3829
- name: build container
39-
run: >
40-
docker compose build
41-
--build-arg UV_PYTHON_PREFERENCE=only-managed
42-
--build-arg APP_PYTHON_VERSION=${{ matrix.python-version }}
30+
run: docker compose build
4331

4432
- name: start services
4533
run: docker compose up -d db client

Dockerfile

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,17 @@ RUN npm run build
1010

1111

1212
# STAGE 2: BUILD PYTHON
13-
FROM python:3.13-bullseye AS build-python
13+
FROM python:3.14 as build-python
1414
WORKDIR /app
1515

1616
COPY --from=ghcr.io/astral-sh/uv:0.9.7 /uv /uvx /bin/
17-
17+
ENV PYTHONPYCACHEPREFIX=/tmp/pycache
18+
ENV PYTHONUNBUFFERED=1
19+
ENV UV_COMPILE_BYTECODE=1
20+
ENV UV_LINK_MODE=copy
1821
ENV LC_ALL=C.UTF-8 LANG=C.UTF-8 \
1922
PATH=/app/.venv/bin:${PATH}
2023

21-
# Use Docker Python version by default
22-
ARG UV_PYTHON_PREFERENCE=${UV_PYTHON_PREFERENCE:-only-system}
23-
ENV UV_PYTHON_PREFERENCE=${UV_PYTHON_PREFERENCE}
24-
25-
# To use a uv-managed Python, specify:
26-
# --build-arg APP_PYTHON_VERSION=3.15 \
27-
# --build-arg UV_PYTHON_PREFERENCE=only-managed
28-
ARG APP_PYTHON_VERSION=${PYTHON_VERSION}
29-
RUN echo "${APP_PYTHON_VERSION}" > .python-version
30-
3124

3225
RUN --mount=type=cache,target=/root/.cache/uv \
3326
--mount=type=bind,source=uv.lock,target=uv.lock \

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
55
[project]
66
name = "django-layout"
77
version = "4.0"
8-
requires-python = ">=3.12"
8+
requires-python = "==3.14.0"
99
dependencies = [
1010
"django==5.1.*",
1111
"dj-database-url",

renovate.json

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": ["helpers:pinGitHubActionDigests"],
3+
"extends": [
4+
"helpers:pinGitHubActionDigests"
5+
],
46
"automerge": true,
57
"automergeType": "pr",
68
"lockFileMaintenance": {
@@ -15,11 +17,4 @@
1517
"enabled": true
1618
},
1719
"rangeStrategy": "pin",
18-
"packageRules": [
19-
{
20-
"matchManagers": ["pep621"],
21-
"matchDepNames": ["python"],
22-
"enabled": false
23-
}
24-
]
2520
}

0 commit comments

Comments
 (0)